1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
Upstream commit 6e189f6073e979ceccaf05c3bb5f495a1b9ed87e
inline, defaults to "extern inline" with newer gcc versions
With newer versions of gcc, "inline" defaults to extern, and not static if
not specified. This causes linking problems at the end of the compile. Most
of this occurences are fixed (or #ifdef'ed away) except these two small
ones in timidity/mfi.c
Signed-off-by: Stian Skjelstad <stian.skjelstad@...>
--- a/timidity/mfi.c 2004-02-17 17:02:18.000000000 +0100
+++ b/timidity/mfi.c 2017-02-14 04:41:24.000000000 +0100
@@ -344,7 +344,7 @@
#define SEND_LASTNOTEINFO(lni, ch) if (LASTNOTEINFO_HAS_DATA((lni)[ch])) SendLastNoteInfo(lni, ch);
#define SEND_AND_CLEAR_LASTNOTEINFO(lni, ch) if (LASTNOTEINFO_HAS_DATA((lni)[ch])) { SendLastNoteInfo(lni, ch); (lni)[ch].on = NO_LAST_NOTE_INFO; }
-inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int duration, int note, int velocity)
+static inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int duration, int note, int velocity)
{
info[channel].on = time;
info[channel].off = time + duration;
@@ -352,7 +352,7 @@
info[channel].velocity = velocity;
}
-inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
+static inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
{
NOTE_BUF_EV_DEBUGSTR(channel, info[channel].on, note_name[info[channel].note % 12], info[channel].note / 12, info[channel].velocity, info[channel].off);
MIDIEVENT(info[channel].on, ME_NOTEON, channel, info[channel].note, info[channel].velocity);
|
