From 791d425ff1391772b23add013e69734a97eb9399 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Tue, 7 Sep 2010 14:09:11 +0000 Subject: plugins (doom, midi, rockboy): don't use non-static inline some functions can be static -> static inline some functions are external and can't be inlined -> remove inline git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28019 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/doom/i_video.c | 4 ++-- apps/plugins/midi/sequencer.c | 2 +- apps/plugins/rockboy/rockmacros.h | 2 +- apps/plugins/rockboy/sys_rockbox.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index e7f8e9014b..7758ca3fea 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -435,7 +435,7 @@ static inline unsigned int read_scroll_wheel(void) } #endif -inline void getkey() +static inline void getkey() { event_t event; /* Same button handling as rockboy */ @@ -609,7 +609,7 @@ inline void getkey() } } -inline void I_StartTic (void) +void I_StartTic (void) { getkey(); } diff --git a/apps/plugins/midi/sequencer.c b/apps/plugins/midi/sequencer.c index 307643e4e5..be26fdd532 100644 --- a/apps/plugins/midi/sequencer.c +++ b/apps/plugins/midi/sequencer.c @@ -186,7 +186,7 @@ static inline void setPW(int ch, int msb, int lsb) computeDeltas(ch); } -inline void pressNote(int ch, int note, int vol) +static inline void pressNote(int ch, int note, int vol) { static int lastKill = 0; /* Silences all channels but one, for easy debugging, for me. */ diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h index e7f79a53d3..f68a613978 100644 --- a/apps/plugins/rockboy/rockmacros.h +++ b/apps/plugins/rockboy/rockmacros.h @@ -30,7 +30,7 @@ void *my_malloc(size_t size); extern int shut,cleanshut; void vid_init(void); -inline void vid_begin(void); +void vid_begin(void); void die(char *message, ...); void doevents(void) ICODE_ATTR; void ev_poll(void); diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c index bf4c513758..7148c8c2b1 100644 --- a/apps/plugins/rockboy/sys_rockbox.c +++ b/apps/plugins/rockboy/sys_rockbox.c @@ -192,7 +192,7 @@ void ev_poll(void) } /* New frameskip, makes more sense to me and performs as well */ -inline void vid_begin(void) +void vid_begin(void) { static int skip = 0; if (skip