From 812a8b6001c075700d49090489d5f2905c5609d0 Mon Sep 17 00:00:00 2001
From: Garux <garux@mail.ru>
Date: Sat, 23 Feb 2019 00:09:42 +0300
Subject: [PATCH] q3map2: follow ODR enables compilation with -fno-common

---
 libs/picomodel/picointernal.h | 2 +-
 tools/quake3/q3map2/q3map2.h  | 6 +++---
 tools/quake3/q3map2/visflow.c | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/libs/picomodel/picointernal.h b/libs/picomodel/picointernal.h
index 274074bd..7b1671ae 100644
--- a/libs/picomodel/picointernal.h
+++ b/libs/picomodel/picointernal.h
@@ -75,7 +75,7 @@ extern "C"
 #define PICO_IOEOF  1
 #define PICO_IOERR  2
 
-const picoColor_t picoColor_white;
+extern const picoColor_t picoColor_white;
 
 /* types */
 typedef struct picoParser_s
diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 38c15756..ad6985f8 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -1006,6 +1006,9 @@ typedef enum
 }
 surfaceType_t;
 
+#ifndef MAIN_C
+extern
+#endif
 char            *surfaceTypes[ NUM_SURFACE_TYPES ]
 #ifndef MAIN_C
 ;
@@ -2020,7 +2023,6 @@ Q_EXTERN float jitters[ MAX_JITTERS ];
 Q_EXTERN qboolean doingBSP Q_ASSIGN( qfalse );
 
 /* commandline arguments */
-Q_EXTERN qboolean verbose;
 Q_EXTERN qboolean verboseEntities Q_ASSIGN( qfalse );
 Q_EXTERN qboolean force Q_ASSIGN( qfalse );
 Q_EXTERN qboolean infoMode Q_ASSIGN( qfalse );
@@ -2213,8 +2215,6 @@ Q_EXTERN leaf_t             *faceleafs;
 Q_EXTERN int numfaces;
 
 Q_EXTERN int c_portaltest, c_portalpass, c_portalcheck;
-Q_EXTERN int c_portalskip, c_leafskip;
-Q_EXTERN int c_vistest, c_mighttest;
 Q_EXTERN int c_chains;
 
 Q_EXTERN byte               *vismap, *vismap_p, *vismap_end;
diff --git a/tools/quake3/q3map2/visflow.c b/tools/quake3/q3map2/visflow.c
index 2348cd3c..0d6706c2 100644
--- a/tools/quake3/q3map2/visflow.c
+++ b/tools/quake3/q3map2/visflow.c
@@ -72,8 +72,6 @@ int CountBits( byte *bits, int numbits ){
 }
 
 int c_fullskip;
-int c_portalskip, c_leafskip;
-int c_vistest, c_mighttest;
 
 int c_chop, c_nochop;