code police : fix some multiply defined variables

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18830 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Frank Gevaerts 2008-10-18 23:31:29 +00:00
parent 695c39bc9c
commit ae7391b187
10 changed files with 10 additions and 10 deletions

View file

@ -64,7 +64,7 @@
#define taxicab(a,b) (abs(column[a]-column[b]) + abs(row[a]-row[b])) #define taxicab(a,b) (abs(column[a]-column[b]) + abs(row[a]-row[b]))
/* ---- RockBox datatypes and variables */ /* ---- RockBox datatypes and variables */
const struct plugin_api* rb; extern const struct plugin_api* rb;
/* ---- Chess datatypes and variables ---- */ /* ---- Chess datatypes and variables ---- */
struct leaf struct leaf

View file

@ -108,7 +108,7 @@ int consoleplayer; // player taking events and displaying
int displayplayer; // view being displayed int displayplayer; // view being displayed
int gametic; int gametic;
int levelstarttic; // gametic at level start 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 int totalkills, totallive, totalitems, totalsecret; // for intermission
boolean demorecording; boolean demorecording;
boolean demoplayback; boolean demoplayback;

View file

@ -101,7 +101,7 @@ int my_close(int id)
return 0; return 0;
} }
#endif #endif
const struct plugin_api* rb; extern const struct plugin_api* rb;
#define MAXARGVS 100 #define MAXARGVS 100
bool noprintf=0; // Variable disables printf lcd updates to protect grayscale lib/direct lcd updates bool noprintf=0; // Variable disables printf lcd updates to protect grayscale lib/direct lcd updates

View file

@ -268,7 +268,7 @@ PLUGIN_IRAM_DECLARE
#endif #endif
#endif #endif
const struct plugin_api* rb; extern const struct plugin_api* rb;
CACHE_FUNCTION_WRAPPERS(rb); CACHE_FUNCTION_WRAPPERS(rb);
ALIGN_BUFFER_WRAPPER(rb); ALIGN_BUFFER_WRAPPER(rb);

View file

@ -34,7 +34,7 @@
PLUGIN_HEADER PLUGIN_HEADER
PLUGIN_IRAM_DECLARE PLUGIN_IRAM_DECLARE
const struct plugin_api* rb; extern const struct plugin_api* rb;
struct pacman_settings { struct pacman_settings {
int difficulty; int difficulty;

View file

@ -32,7 +32,7 @@ PLUGIN_IRAM_DECLARE
/* here is a global api struct pointer. while not strictly necessary, /* 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 it's nice not to have to pass the api pointer in all function calls
in the plugin */ in the plugin */
const struct plugin_api* rb; bool plugbuf;
int shut,cleanshut; int shut,cleanshut;
char *errormsg; char *errormsg;

View file

@ -109,7 +109,7 @@ struct options {
int dirty; int dirty;
}; };
bool plugbuf; extern bool plugbuf;
extern struct options options; extern struct options options;
#define savedir ROCKBOX_DIR "/rockboy" #define savedir ROCKBOX_DIR "/rockboy"

View file

@ -82,7 +82,7 @@ PLUGIN_HEADER
it's nice not to have to pass the api pointer in all function calls it's nice not to have to pass the api pointer in all function calls
in the plugin */ 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. */ /* Default game - used to initialise sudoku.ss if it doesn't exist. */
static const char default_game[9][9] = static const char default_game[9][9] =

View file

@ -24,7 +24,7 @@
PLUGIN_HEADER PLUGIN_HEADER
PLUGIN_IRAM_DECLARE PLUGIN_IRAM_DECLARE
const struct plugin_api* rb; extern const struct plugin_api* rb;
#include "spkey_p.h" #include "spkey_p.h"

View file

@ -32,7 +32,7 @@ struct tea5767_region_data
unsigned char band; /* 0: europe, 1: japan (BL in TEA spec)*/ unsigned char band; /* 0: europe, 1: japan (BL in TEA spec)*/
} __attribute__((packed)); } __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 struct tea5767_dbg_info
{ {