From ae7391b187669a89c9c7d0f30400946ab741c7fe Mon Sep 17 00:00:00 2001
From: Frank Gevaerts <frank@gevaerts.be>
Date: Sat, 18 Oct 2008 23:31:29 +0000
Subject: [PATCH] code police : fix some multiply defined variables

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18830 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/chessbox/gnuchess.c     | 2 +-
 apps/plugins/doom/g_game.c           | 2 +-
 apps/plugins/doom/rockdoom.c         | 2 +-
 apps/plugins/mpegplayer/mpegplayer.c | 2 +-
 apps/plugins/pacbox/pacbox.c         | 2 +-
 apps/plugins/rockboy/rockboy.c       | 2 +-
 apps/plugins/rockboy/rockmacros.h    | 2 +-
 apps/plugins/sudoku/sudoku.c         | 2 +-
 apps/plugins/zxbox/zxbox.c           | 2 +-
 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 @@
 #define taxicab(a,b) (abs(column[a]-column[b]) + abs(row[a]-row[b]))
 
 /* ---- RockBox datatypes and variables */
-const struct plugin_api* rb;
+extern const struct plugin_api* rb;
 
 /* ---- Chess datatypes and variables ---- */
 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
 int             displayplayer; // view being displayed
 int             gametic;
 int             levelstarttic; // gametic at level start
-int             basetic;       /* killough 9/29/98: for demo sync */
+extern int      basetic;       /* killough 9/29/98: for demo sync */
 int             totalkills, totallive, totalitems, totalsecret;    // for intermission
 boolean         demorecording;
 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)
    return 0;
 }
 #endif
-const struct plugin_api* rb;
+extern const struct plugin_api* rb;
 #define MAXARGVS  100
 
 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
 #endif
 #endif
 
-const struct plugin_api* rb;
+extern const struct plugin_api* rb;
 
 CACHE_FUNCTION_WRAPPERS(rb);
 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 @@
 PLUGIN_HEADER
 PLUGIN_IRAM_DECLARE
 
-const struct plugin_api* rb;
+extern const struct plugin_api* rb;
 
 struct pacman_settings {
     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
 /* here is a global api struct pointer. while not strictly necessary,
    it's nice not to have to pass the api pointer in all function calls
    in the plugin */
-const struct plugin_api* rb;
+bool plugbuf;
 int shut,cleanshut;
 char *errormsg;
 
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 {
    int dirty;
 };
 
-bool plugbuf;
+extern bool plugbuf;
 
 extern struct options options;
 #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
    it's nice not to have to pass the api pointer in all function calls
    in the plugin */
 
-const struct plugin_api* rb;
+extern const struct plugin_api* rb;
 
 /* Default game - used to initialise sudoku.ss if it doesn't exist. */
 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 @@
 PLUGIN_HEADER
 PLUGIN_IRAM_DECLARE
 
-const struct plugin_api* rb;
+extern const struct plugin_api* rb;
 
 #include "spkey_p.h"
 
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
     unsigned char band; /* 0: europe, 1: japan (BL in TEA spec)*/
 } __attribute__((packed));
 
-const struct tea5767_region_data tea5767_region_data[TUNER_NUM_REGIONS];
+extern const struct tea5767_region_data tea5767_region_data[TUNER_NUM_REGIONS];
 
 struct tea5767_dbg_info
 {