1
0
Fork 0
forked from fte/fteqw

patch to use extern properly. divVerent neededed it, so we might as well.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3950 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-01-01 17:34:32 +00:00
parent 1f4c6c0da3
commit ac526f0e1b
4 changed files with 30 additions and 25 deletions

View file

@ -281,7 +281,7 @@ extern hashtable_t globalstable, localstable;
#endif #endif
#ifdef WRITEASM #ifdef WRITEASM
FILE *asmfile; extern FILE *asmfile;
#endif #endif
//============================================================================= //=============================================================================
@ -854,23 +854,32 @@ extern int numtemps;
typedef char PATHSTRING[MAX_DATA_PATH]; typedef char PATHSTRING[MAX_DATA_PATH];
PATHSTRING *precache_sounds; extern PATHSTRING *precache_sounds;
int *precache_sounds_block; extern int *precache_sounds_block;
int *precache_sounds_used; extern int *precache_sounds_used;
int numsounds; extern int numsounds;
PATHSTRING *precache_textures; extern PATHSTRING *precache_textures;
int *precache_textures_block; extern int *precache_textures_block;
int numtextures; extern int numtextures;
PATHSTRING *precache_models; extern PATHSTRING *precache_models;
int *precache_models_block; extern int *precache_models_block;
int *precache_models_used; extern int *precache_models_used;
int nummodels; extern int nummodels;
PATHSTRING *precache_files; extern PATHSTRING *precache_files;
int *precache_files_block; extern int *precache_files_block;
int numfiles; extern int numfiles;
typedef struct qcc_includechunk_s {
struct qcc_includechunk_s *prev;
char *filename;
char *currentdatapoint;
int currentlinenumber;
CompilerConstant_t *cnst;
} qcc_includechunk_t;
extern qcc_includechunk_t *currentchunk;
int QCC_CopyString (char *str); int QCC_CopyString (char *str);

View file

@ -9292,7 +9292,6 @@ pbool QCC_Include(char *filename)
int opr_source_line; int opr_source_line;
char *ocompilingfile; char *ocompilingfile;
struct qcc_includechunk_s *oldcurrentchunk; struct qcc_includechunk_s *oldcurrentchunk;
extern struct qcc_includechunk_s *currentchunk;
ocompilingfile = compilingfile; ocompilingfile = compilingfile;
os_file = s_file; os_file = s_file;

View file

@ -88,13 +88,6 @@ void QCC_PR_LexWhitespace (void);
//for compiler constants and file includes. //for compiler constants and file includes.
typedef struct qcc_includechunk_s {
struct qcc_includechunk_s *prev;
char *filename;
char *currentdatapoint;
int currentlinenumber;
CompilerConstant_t *cnst;
} qcc_includechunk_t;
qcc_includechunk_t *currentchunk; qcc_includechunk_t *currentchunk;
void QCC_PR_IncludeChunkEx (char *data, pbool duplicate, char *filename, CompilerConstant_t *cnst) void QCC_PR_IncludeChunkEx (char *data, pbool duplicate, char *filename, CompilerConstant_t *cnst)
{ {

View file

@ -27,8 +27,6 @@ void QCC_PR_LexWhitespace (void);
void *FS_ReadToMem(char *fname, void *membuf, int *len); void *FS_ReadToMem(char *fname, void *membuf, int *len);
void FS_CloseFromMem(void *mem); void FS_CloseFromMem(void *mem);
struct qcc_includechunk_s *currentchunk;
unsigned int MAX_REGS; unsigned int MAX_REGS;
int MAX_STRINGS; int MAX_STRINGS;
@ -78,14 +76,17 @@ int numfielddefs;
PATHSTRING *precache_sounds; PATHSTRING *precache_sounds;
int *precache_sounds_block; int *precache_sounds_block;
int *precache_sounds_used;
int numsounds; int numsounds;
PATHSTRING *precache_textures; PATHSTRING *precache_textures;
int *precache_textures_block; int *precache_textures_block;
int *precache_textures_block;
int numtextures; int numtextures;
PATHSTRING *precache_models; PATHSTRING *precache_models;
int *precache_models_block; int *precache_models_block;
int *precache_models_used;
int nummodels; int nummodels;
PATHSTRING *precache_files; PATHSTRING *precache_files;
@ -96,6 +97,9 @@ extern int numCompilerConstants;
hashtable_t compconstantstable; hashtable_t compconstantstable;
hashtable_t globalstable; hashtable_t globalstable;
hashtable_t localstable; hashtable_t localstable;
#ifdef WRITEASM
FILE *asmfile;
#endif
hashtable_t floatconstdefstable; hashtable_t floatconstdefstable;
hashtable_t stringconstdefstable; hashtable_t stringconstdefstable;
hashtable_t stringconstdefstable_trans; hashtable_t stringconstdefstable_trans;