summaryrefslogtreecommitdiff
path: root/apps/plugins
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-10-18 23:31:29 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-10-18 23:31:29 +0000
commitae7391b187669a89c9c7d0f30400946ab741c7fe (patch)
tree967cb8861066e8eb1485eddde3e4a230a6c617c6 /apps/plugins
parent695c39bc9cb56214ae86bc79bf129d6cb074a43b (diff)
downloadrockbox-ae7391b187669a89c9c7d0f30400946ab741c7fe.tar.gz
rockbox-ae7391b187669a89c9c7d0f30400946ab741c7fe.zip
code police : fix some multiply defined variables
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18830 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r--apps/plugins/chessbox/gnuchess.c2
-rw-r--r--apps/plugins/doom/g_game.c2
-rw-r--r--apps/plugins/doom/rockdoom.c2
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c2
-rw-r--r--apps/plugins/pacbox/pacbox.c2
-rw-r--r--apps/plugins/rockboy/rockboy.c2
-rw-r--r--apps/plugins/rockboy/rockmacros.h2
-rw-r--r--apps/plugins/sudoku/sudoku.c2
-rw-r--r--apps/plugins/zxbox/zxbox.c2
9 files changed, 9 insertions, 9 deletions
diff --git a/apps/plugins/chessbox/gnuchess.c b/apps/plugins/chessbox/gnuchess.c
index 51e200d0f2..b164e1f83f 100644
--- a/apps/plugins/chessbox/gnuchess.c
+++ b/apps/plugins/chessbox/gnuchess.c
@@ -64,7 +64,7 @@
64#define taxicab(a,b) (abs(column[a]-column[b]) + abs(row[a]-row[b])) 64#define taxicab(a,b) (abs(column[a]-column[b]) + abs(row[a]-row[b]))
65 65
66/* ---- RockBox datatypes and variables */ 66/* ---- RockBox datatypes and variables */
67const struct plugin_api* rb; 67extern const struct plugin_api* rb;
68 68
69/* ---- Chess datatypes and variables ---- */ 69/* ---- Chess datatypes and variables ---- */
70struct leaf 70struct leaf
diff --git a/apps/plugins/doom/g_game.c b/apps/plugins/doom/g_game.c
index 8b5e222082..e8c55eb77e 100644
--- a/apps/plugins/doom/g_game.c
+++ b/apps/plugins/doom/g_game.c
@@ -108,7 +108,7 @@ int consoleplayer; // player taking events and displaying
108int displayplayer; // view being displayed 108int displayplayer; // view being displayed
109int gametic; 109int gametic;
110int levelstarttic; // gametic at level start 110int levelstarttic; // gametic at level start
111int basetic; /* killough 9/29/98: for demo sync */ 111extern int basetic; /* killough 9/29/98: for demo sync */
112int totalkills, totallive, totalitems, totalsecret; // for intermission 112int totalkills, totallive, totalitems, totalsecret; // for intermission
113boolean demorecording; 113boolean demorecording;
114boolean demoplayback; 114boolean demoplayback;
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c
index 763e9d5681..eb5006494f 100644
--- a/apps/plugins/doom/rockdoom.c
+++ b/apps/plugins/doom/rockdoom.c
@@ -101,7 +101,7 @@ int my_close(int id)
101 return 0; 101 return 0;
102} 102}
103#endif 103#endif
104const struct plugin_api* rb; 104extern const struct plugin_api* rb;
105#define MAXARGVS 100 105#define MAXARGVS 100
106 106
107bool noprintf=0; // Variable disables printf lcd updates to protect grayscale lib/direct lcd updates 107bool noprintf=0; // Variable disables printf lcd updates to protect grayscale lib/direct lcd updates
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index cb8c0d2133..596bbf6817 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -268,7 +268,7 @@ PLUGIN_IRAM_DECLARE
268#endif 268#endif
269#endif 269#endif
270 270
271const struct plugin_api* rb; 271extern const struct plugin_api* rb;
272 272
273CACHE_FUNCTION_WRAPPERS(rb); 273CACHE_FUNCTION_WRAPPERS(rb);
274ALIGN_BUFFER_WRAPPER(rb); 274ALIGN_BUFFER_WRAPPER(rb);
diff --git a/apps/plugins/pacbox/pacbox.c b/apps/plugins/pacbox/pacbox.c
index c4ee037b5a..e5d3c225ce 100644
--- a/apps/plugins/pacbox/pacbox.c
+++ b/apps/plugins/pacbox/pacbox.c
@@ -34,7 +34,7 @@
34PLUGIN_HEADER 34PLUGIN_HEADER
35PLUGIN_IRAM_DECLARE 35PLUGIN_IRAM_DECLARE
36 36
37const struct plugin_api* rb; 37extern const struct plugin_api* rb;
38 38
39struct pacman_settings { 39struct pacman_settings {
40 int difficulty; 40 int difficulty;
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index 1addef2e44..57dbd21590 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -32,7 +32,7 @@ PLUGIN_IRAM_DECLARE
32/* here is a global api struct pointer. while not strictly necessary, 32/* here is a global api struct pointer. while not strictly necessary,
33 it's nice not to have to pass the api pointer in all function calls 33 it's nice not to have to pass the api pointer in all function calls
34 in the plugin */ 34 in the plugin */
35const struct plugin_api* rb; 35bool plugbuf;
36int shut,cleanshut; 36int shut,cleanshut;
37char *errormsg; 37char *errormsg;
38 38
diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h
index 179de2313f..b60f1e9763 100644
--- a/apps/plugins/rockboy/rockmacros.h
+++ b/apps/plugins/rockboy/rockmacros.h
@@ -109,7 +109,7 @@ struct options {
109 int dirty; 109 int dirty;
110}; 110};
111 111
112bool plugbuf; 112extern bool plugbuf;
113 113
114extern struct options options; 114extern struct options options;
115#define savedir ROCKBOX_DIR "/rockboy" 115#define savedir ROCKBOX_DIR "/rockboy"
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c
index 3910e14011..9a6def229c 100644
--- a/apps/plugins/sudoku/sudoku.c
+++ b/apps/plugins/sudoku/sudoku.c
@@ -82,7 +82,7 @@ PLUGIN_HEADER
82 it's nice not to have to pass the api pointer in all function calls 82 it's nice not to have to pass the api pointer in all function calls
83 in the plugin */ 83 in the plugin */
84 84
85const struct plugin_api* rb; 85extern const struct plugin_api* rb;
86 86
87/* Default game - used to initialise sudoku.ss if it doesn't exist. */ 87/* Default game - used to initialise sudoku.ss if it doesn't exist. */
88static const char default_game[9][9] = 88static const char default_game[9][9] =
diff --git a/apps/plugins/zxbox/zxbox.c b/apps/plugins/zxbox/zxbox.c
index fbb61c1352..3d268dbb1f 100644
--- a/apps/plugins/zxbox/zxbox.c
+++ b/apps/plugins/zxbox/zxbox.c
@@ -24,7 +24,7 @@
24PLUGIN_HEADER 24PLUGIN_HEADER
25PLUGIN_IRAM_DECLARE 25PLUGIN_IRAM_DECLARE
26 26
27const struct plugin_api* rb; 27extern const struct plugin_api* rb;
28 28
29#include "spkey_p.h" 29#include "spkey_p.h"
30 30