From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 15 May 2020 02:21:03 +0000 (+0200)
Subject: q2map: declare once, define as extern
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69546b5d3b11a6b7e3b07bb995971ffa52cf3728;p=xonotic%2Fnetradiant.git

q2map: declare once, define as extern
---

diff --git a/tools/quake2/q2map/main.c b/tools/quake2/q2map/main.c
index fb85403b..6f5318f5 100644
--- a/tools/quake2/q2map/main.c
+++ b/tools/quake2/q2map/main.c
@@ -60,6 +60,7 @@ extern float subdivide_size;
 
 // VIS
 extern char inbase[32];
+extern char outbase[32];
 extern qboolean fastvis;
 extern qboolean nosort;
 extern int testlevel;
diff --git a/tools/quake2/q2map/qbsp.c b/tools/quake2/q2map/qbsp.c
index 3b8995b2..1642c1d2 100644
--- a/tools/quake2/q2map/qbsp.c
+++ b/tools/quake2/q2map/qbsp.c
@@ -45,8 +45,6 @@ qboolean noopt;
 qboolean leaktest;
 qboolean verboseentities;
 
-char outbase[32];
-
 int block_xl = -8, block_xh = 7, block_yl = -8, block_yh = 7;
 
 int entity_num;
diff --git a/tools/quake2/q2map/qrad.c b/tools/quake2/q2map/qrad.c
index 8726c0f3..6772c9d8 100644
--- a/tools/quake2/q2map/qrad.c
+++ b/tools/quake2/q2map/qrad.c
@@ -44,7 +44,8 @@ vec3_t illumination[MAX_PATCHES];       // light arriving at a patch
 vec3_t face_offset[MAX_MAP_FACES];          // for rotating bmodels
 dplane_t backplanes[MAX_MAP_PLANES];
 
-char inbase[32], outbase[32];
+extern char inbase[32];
+extern char outbase[32];
 
 int fakeplanes;                         // created planes for origin offset
 
@@ -64,11 +65,11 @@ float maxlight = 196;
 
 float lightscale = 1.0;
 
-qboolean glview;
+extern qboolean glview;
 
 qboolean nopvs;
 
-char source[1024];
+extern char source[1024];
 
 float direct_scale =  0.4;
 float entity_scale =  1.0;