Dave Plater
aa814d6200
with gcc-15 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=247
98 lines
2.8 KiB
Diff
98 lines
2.8 KiB
Diff
From f2085f63327507c586ed8cb42c2ea15c16359129 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Makarenko <kryksyh@gmail.com>
|
|
Date: Sun, 15 Jun 2025 19:54:09 +0300
|
|
Subject: [PATCH] Use full function prototypes in libnyquist
|
|
|
|
Fixes compilation on GCC15.1
|
|
---
|
|
lib-src/libnyquist/nyquist/cmt/midifile.c | 40 ++---------------------
|
|
1 file changed, 2 insertions(+), 38 deletions(-)
|
|
|
|
diff --git a/lib-src/libnyquist/nyquist/cmt/midifile.c b/lib-src/libnyquist/nyquist/cmt/midifile.c
|
|
index 878441a5980f..01168bd7d044 100644
|
|
--- a/lib-src/libnyquist/nyquist/cmt/midifile.c
|
|
+++ b/lib-src/libnyquist/nyquist/cmt/midifile.c
|
|
@@ -23,12 +23,8 @@
|
|
#include "string.h"
|
|
|
|
#define MIDIFILE_ERROR -1
|
|
-
|
|
-#ifdef PROTOTYPES
|
|
#define NOARGS void
|
|
-#else
|
|
-#define NOARGS
|
|
-#endif
|
|
+
|
|
|
|
/* public stuff */
|
|
extern int abort_flag;
|
|
@@ -38,7 +34,6 @@ void (*Mf_starttrack)(NOARGS) = 0;
|
|
void (*Mf_endtrack)(NOARGS) = 0;
|
|
int (*Mf_getc)(NOARGS) = 0;
|
|
void (*Mf_eot)(NOARGS) = 0;
|
|
-#ifdef PROTOTYPES
|
|
void (*Mf_error)(char *) = 0;
|
|
void (*Mf_header)(int,int,int) = 0;
|
|
void (*Mf_on)(int,int,int) = 0;
|
|
@@ -58,27 +53,6 @@ void (*Mf_tempo)(int) = 0;
|
|
void (*Mf_keysig)(int,int) = 0;
|
|
void (*Mf_sqspecific)(int,char*) = 0;
|
|
void (*Mf_text)(int,int,char*) = 0;
|
|
-#else
|
|
-void (*Mf_error)() = 0;
|
|
-void (*Mf_header)() = 0;
|
|
-void (*Mf_on)() = 0;
|
|
-void (*Mf_off)() = 0;
|
|
-void (*Mf_pressure)() = 0;
|
|
-void (*Mf_controller)() = 0;
|
|
-void (*Mf_pitchbend)() = 0;
|
|
-void (*Mf_program)() = 0;
|
|
-void (*Mf_chanpressure)() = 0;
|
|
-void (*Mf_sysex)() = 0;
|
|
-void (*Mf_arbitrary)() = 0;
|
|
-void (*Mf_metamisc)() = 0;
|
|
-void (*Mf_seqnum)() = 0;
|
|
-void (*Mf_smpte)() = 0;
|
|
-void (*Mf_tempo)() = 0;
|
|
-void (*Mf_timesig)() = 0;
|
|
-void (*Mf_keysig)() = 0;
|
|
-void (*Mf_sqspecific)() = 0;
|
|
-void (*Mf_text)() = 0;
|
|
-#endif
|
|
|
|
int Mf_nomerge = 0; /* 1 => continue'ed system exclusives are */
|
|
/* not collapsed. */
|
|
@@ -100,7 +74,6 @@ static void sysex(NOARGS), msginit(NOARGS);
|
|
static int egetc(NOARGS);
|
|
static int msgleng(NOARGS);
|
|
|
|
-#ifdef PROTOTYPES
|
|
static int readmt(char*,int);
|
|
static long to32bit(int,int,int,int);
|
|
static int to16bit(int,int);
|
|
@@ -109,15 +82,6 @@ static void badbyte(int);
|
|
static void metaevent(int);
|
|
static void msgadd(int);
|
|
static void chanmessage(int,int,int);
|
|
-#else
|
|
-static long to32bit();
|
|
-static int to16bit();
|
|
-static void mferror();
|
|
-static void badbyte();
|
|
-static void metaevent();
|
|
-static void msgadd();
|
|
-static void chanmessage();
|
|
-#endif
|
|
|
|
static int midifile_error;
|
|
|
|
@@ -128,7 +92,7 @@ midifile() /* The only non-static function in this file. */
|
|
midifile_error = 0;
|
|
|
|
if ( Mf_getc == 0 ) {
|
|
- mferror("mf.h() called without setting Mf_getc");
|
|
+ mferror("mf.h() called without setting Mf_getc");
|
|
return;
|
|
}
|
|
ntrks = readheader();
|