Don't declare things in more than one place. Move some declarations

between headers.  Code is now fully prototyped and compiles cleanly
with gcc -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
-Wredundant-decls.  Closes #723788.
This commit is contained in:
Markus Armbruster 2004-02-20 20:45:18 +00:00
parent 46da1aec7a
commit c1be5d8657
18 changed files with 35 additions and 270 deletions

View file

@ -205,10 +205,6 @@ extern long last_demand_update;
/* Game parameters that cannot be set in econfig (yet) */
extern int melt_item_denom[];
extern float start_education;
extern float start_happiness;
extern float start_technology;
extern float start_research;
#ifdef START_UNITS
int start_unit_type[];
#endif
@ -217,13 +213,13 @@ int start_unit_type[];
extern s_char *upfil;
extern s_char *downfil;
extern s_char *disablefil;
extern s_char *telfil;
extern s_char *annfil;
extern s_char *commfil;
extern s_char *banfil;
extern s_char *authfil;
extern s_char *commfil;
extern s_char *annfil;
extern s_char *timestampfil;
/* teldir, telfil, annfil are in tel.h */
extern s_char *teldir;
extern s_char *telfil;
struct keymatch {
s_char *km_key; /* the key */