summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-09-07 14:09:11 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-09-07 14:09:11 +0000
commit791d425ff1391772b23add013e69734a97eb9399 (patch)
treed8ee987f8fe1cdddd00bb0b6dda33222240bb608
parent17e5399d3dc78f70a092fe2563e4fff59241bde2 (diff)
downloadrockbox-791d425ff1391772b23add013e69734a97eb9399.tar.gz
rockbox-791d425ff1391772b23add013e69734a97eb9399.zip
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
-rw-r--r--apps/plugins/doom/i_video.c4
-rw-r--r--apps/plugins/midi/sequencer.c2
-rw-r--r--apps/plugins/rockboy/rockmacros.h2
-rw-r--r--apps/plugins/rockboy/sys_rockbox.c2
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)
435} 435}
436#endif 436#endif
437 437
438inline void getkey() 438static inline void getkey()
439{ 439{
440 event_t event; 440 event_t event;
441 /* Same button handling as rockboy */ 441 /* Same button handling as rockboy */
@@ -609,7 +609,7 @@ inline void getkey()
609 } 609 }
610} 610}
611 611
612inline void I_StartTic (void) 612void I_StartTic (void)
613{ 613{
614 getkey(); 614 getkey();
615} 615}
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)
186 computeDeltas(ch); 186 computeDeltas(ch);
187} 187}
188 188
189inline void pressNote(int ch, int note, int vol) 189static inline void pressNote(int ch, int note, int vol)
190{ 190{
191 static int lastKill = 0; 191 static int lastKill = 0;
192/* Silences all channels but one, for easy debugging, for me. */ 192/* 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);
30 30
31extern int shut,cleanshut; 31extern int shut,cleanshut;
32void vid_init(void); 32void vid_init(void);
33inline void vid_begin(void); 33void vid_begin(void);
34void die(char *message, ...); 34void die(char *message, ...);
35void doevents(void) ICODE_ATTR; 35void doevents(void) ICODE_ATTR;
36void ev_poll(void); 36void 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)
192} 192}
193 193
194/* New frameskip, makes more sense to me and performs as well */ 194/* New frameskip, makes more sense to me and performs as well */
195inline void vid_begin(void) 195void vid_begin(void)
196{ 196{
197 static int skip = 0; 197 static int skip = 0;
198 if (skip<options.frameskip) 198 if (skip<options.frameskip)