From ac526f0e1b501f8ee663423fbaaef887616adf1e Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Sun, 1 Jan 2012 17:34:32 +0000
Subject: [PATCH] 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
---
 engine/qclib/qcc.h         | 39 +++++++++++++++++++++++---------------
 engine/qclib/qcc_pr_comp.c |  1 -
 engine/qclib/qcc_pr_lex.c  |  7 -------
 engine/qclib/qccmain.c     |  8 ++++++--
 4 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/engine/qclib/qcc.h b/engine/qclib/qcc.h
index 26d63a135..bbd90b0c1 100644
--- a/engine/qclib/qcc.h
+++ b/engine/qclib/qcc.h
@@ -281,7 +281,7 @@ extern hashtable_t globalstable, localstable;
 #endif
 
 #ifdef WRITEASM
-FILE *asmfile;
+extern FILE *asmfile;
 #endif
 //=============================================================================
 
@@ -854,23 +854,32 @@ extern int numtemps;
 
 typedef char PATHSTRING[MAX_DATA_PATH];
 
-PATHSTRING		*precache_sounds;
-int			*precache_sounds_block;
-int			*precache_sounds_used;
-int			numsounds;
+extern PATHSTRING		*precache_sounds;
+extern int			*precache_sounds_block;
+extern int			*precache_sounds_used;
+extern int			numsounds;
 
-PATHSTRING		*precache_textures;
-int			*precache_textures_block;
-int			numtextures;
+extern PATHSTRING		*precache_textures;
+extern int			*precache_textures_block;
+extern int			numtextures;
 
-PATHSTRING		*precache_models;
-int			*precache_models_block;
-int			*precache_models_used;
-int			nummodels;
+extern PATHSTRING		*precache_models;
+extern int			*precache_models_block;
+extern int			*precache_models_used;
+extern int			nummodels;
 
-PATHSTRING		*precache_files;
-int			*precache_files_block;
-int			numfiles;
+extern PATHSTRING		*precache_files;
+extern int			*precache_files_block;
+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);
 
diff --git a/engine/qclib/qcc_pr_comp.c b/engine/qclib/qcc_pr_comp.c
index 3ffcf653b..90564783b 100644
--- a/engine/qclib/qcc_pr_comp.c
+++ b/engine/qclib/qcc_pr_comp.c
@@ -9292,7 +9292,6 @@ pbool QCC_Include(char *filename)
 	int opr_source_line;
 	char *ocompilingfile;
 	struct qcc_includechunk_s *oldcurrentchunk;
-	extern struct qcc_includechunk_s *currentchunk;
 
 	ocompilingfile = compilingfile;
 	os_file = s_file;
diff --git a/engine/qclib/qcc_pr_lex.c b/engine/qclib/qcc_pr_lex.c
index ac3c96cb1..1f84fdd48 100644
--- a/engine/qclib/qcc_pr_lex.c
+++ b/engine/qclib/qcc_pr_lex.c
@@ -88,13 +88,6 @@ void QCC_PR_LexWhitespace (void);
 
 //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;
 void QCC_PR_IncludeChunkEx (char *data, pbool duplicate, char *filename, CompilerConstant_t *cnst)
 {
diff --git a/engine/qclib/qccmain.c b/engine/qclib/qccmain.c
index 68fc0d7a9..6c5f2beca 100644
--- a/engine/qclib/qccmain.c
+++ b/engine/qclib/qccmain.c
@@ -27,8 +27,6 @@ void QCC_PR_LexWhitespace (void);
 void *FS_ReadToMem(char *fname, void *membuf, int *len);
 void FS_CloseFromMem(void *mem);
 
-struct qcc_includechunk_s *currentchunk;
-
 unsigned int MAX_REGS;
 
 int	MAX_STRINGS;
@@ -78,14 +76,17 @@ int			numfielddefs;
 
 PATHSTRING		*precache_sounds;
 int			*precache_sounds_block;
+int			*precache_sounds_used;
 int			numsounds;
 
 PATHSTRING		*precache_textures;
 int			*precache_textures_block;
+int			*precache_textures_block;
 int			numtextures;
 
 PATHSTRING		*precache_models;
 int			*precache_models_block;
+int			*precache_models_used;
 int			nummodels;
 
 PATHSTRING		*precache_files;
@@ -96,6 +97,9 @@ extern int numCompilerConstants;
 hashtable_t compconstantstable;
 hashtable_t globalstable;
 hashtable_t localstable;
+#ifdef WRITEASM
+FILE *asmfile;
+#endif
 hashtable_t floatconstdefstable;
 hashtable_t stringconstdefstable;
 hashtable_t stringconstdefstable_trans;