diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-10-18 23:31:29 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-10-18 23:31:29 +0000 |
commit | ae7391b187669a89c9c7d0f30400946ab741c7fe (patch) | |
tree | 967cb8861066e8eb1485eddde3e4a230a6c617c6 | |
parent | 695c39bc9cb56214ae86bc79bf129d6cb074a43b (diff) | |
download | rockbox-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
-rw-r--r-- | apps/plugins/chessbox/gnuchess.c | 2 | ||||
-rw-r--r-- | apps/plugins/doom/g_game.c | 2 | ||||
-rw-r--r-- | apps/plugins/doom/rockdoom.c | 2 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 2 | ||||
-rw-r--r-- | apps/plugins/pacbox/pacbox.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockmacros.h | 2 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.c | 2 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox.c | 2 | ||||
-rw-r--r-- | firmware/export/tea5767.h | 2 |
10 files changed, 10 insertions, 10 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 */ |
67 | const struct plugin_api* rb; | 67 | extern const struct plugin_api* rb; |
68 | 68 | ||
69 | /* ---- Chess datatypes and variables ---- */ | 69 | /* ---- Chess datatypes and variables ---- */ |
70 | struct leaf | 70 | struct 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 | |||
108 | int displayplayer; // view being displayed | 108 | int displayplayer; // view being displayed |
109 | int gametic; | 109 | int gametic; |
110 | int levelstarttic; // gametic at level start | 110 | int levelstarttic; // gametic at level start |
111 | int basetic; /* killough 9/29/98: for demo sync */ | 111 | extern int basetic; /* killough 9/29/98: for demo sync */ |
112 | int totalkills, totallive, totalitems, totalsecret; // for intermission | 112 | int totalkills, totallive, totalitems, totalsecret; // for intermission |
113 | boolean demorecording; | 113 | boolean demorecording; |
114 | boolean demoplayback; | 114 | boolean 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 |
104 | const struct plugin_api* rb; | 104 | extern const struct plugin_api* rb; |
105 | #define MAXARGVS 100 | 105 | #define MAXARGVS 100 |
106 | 106 | ||
107 | bool noprintf=0; // Variable disables printf lcd updates to protect grayscale lib/direct lcd updates | 107 | bool 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 | ||
271 | const struct plugin_api* rb; | 271 | extern const struct plugin_api* rb; |
272 | 272 | ||
273 | CACHE_FUNCTION_WRAPPERS(rb); | 273 | CACHE_FUNCTION_WRAPPERS(rb); |
274 | ALIGN_BUFFER_WRAPPER(rb); | 274 | ALIGN_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 @@ | |||
34 | PLUGIN_HEADER | 34 | PLUGIN_HEADER |
35 | PLUGIN_IRAM_DECLARE | 35 | PLUGIN_IRAM_DECLARE |
36 | 36 | ||
37 | const struct plugin_api* rb; | 37 | extern const struct plugin_api* rb; |
38 | 38 | ||
39 | struct pacman_settings { | 39 | struct 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 */ |
35 | const struct plugin_api* rb; | 35 | bool plugbuf; |
36 | int shut,cleanshut; | 36 | int shut,cleanshut; |
37 | char *errormsg; | 37 | char *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 | ||
112 | bool plugbuf; | 112 | extern bool plugbuf; |
113 | 113 | ||
114 | extern struct options options; | 114 | extern 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 | ||
85 | const struct plugin_api* rb; | 85 | extern 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. */ |
88 | static const char default_game[9][9] = | 88 | static 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 @@ | |||
24 | PLUGIN_HEADER | 24 | PLUGIN_HEADER |
25 | PLUGIN_IRAM_DECLARE | 25 | PLUGIN_IRAM_DECLARE |
26 | 26 | ||
27 | const struct plugin_api* rb; | 27 | extern const struct plugin_api* rb; |
28 | 28 | ||
29 | #include "spkey_p.h" | 29 | #include "spkey_p.h" |
30 | 30 | ||
diff --git a/firmware/export/tea5767.h b/firmware/export/tea5767.h index 874c4190c5..dceb0f4168 100644 --- a/firmware/export/tea5767.h +++ b/firmware/export/tea5767.h | |||
@@ -32,7 +32,7 @@ struct tea5767_region_data | |||
32 | unsigned char band; /* 0: europe, 1: japan (BL in TEA spec)*/ | 32 | unsigned char band; /* 0: europe, 1: japan (BL in TEA spec)*/ |
33 | } __attribute__((packed)); | 33 | } __attribute__((packed)); |
34 | 34 | ||
35 | const struct tea5767_region_data tea5767_region_data[TUNER_NUM_REGIONS]; | 35 | extern const struct tea5767_region_data tea5767_region_data[TUNER_NUM_REGIONS]; |
36 | 36 | ||
37 | struct tea5767_dbg_info | 37 | struct tea5767_dbg_info |
38 | { | 38 | { |