quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

q3map2: follow ODR

Browse Source 
enables compilation with -fno-common
This commit is contained in:
Garux 2019-02-23 00:09:42 +03:00
parent 202a05461f
commit 812a8b6001
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/picomodel/picointernal.h
View File

@ -75,7 +75,7 @@ extern "C"
#define PICO_IOEOF 1 #define PICO_IOEOF 1
#define PICO_IOERR 2 #define PICO_IOERR 2
const picoColor_t picoColor_white; extern const picoColor_t picoColor_white;
/* types */ /* types */
typedef struct picoParser_s typedef struct picoParser_s

6
tools/quake3/q3map2/q3map2.h
View File

@ -1006,6 +1006,9 @@ typedef enum
} }
surfaceType_t; surfaceType_t;
#ifndef MAIN_C
extern
#endif
char *surfaceTypes[ NUM_SURFACE_TYPES ] char *surfaceTypes[ NUM_SURFACE_TYPES ]
#ifndef MAIN_C #ifndef MAIN_C
; ;
@ -2020,7 +2023,6 @@ Q_EXTERN float jitters[ MAX_JITTERS ];
Q_EXTERN qboolean doingBSP Q_ASSIGN( qfalse ); Q_EXTERN qboolean doingBSP Q_ASSIGN( qfalse );
/* commandline arguments */ /* commandline arguments */
Q_EXTERN qboolean verbose;
Q_EXTERN qboolean verboseEntities Q_ASSIGN( qfalse ); Q_EXTERN qboolean verboseEntities Q_ASSIGN( qfalse );
Q_EXTERN qboolean force Q_ASSIGN( qfalse ); Q_EXTERN qboolean force Q_ASSIGN( qfalse );
Q_EXTERN qboolean infoMode 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 numfaces;
Q_EXTERN int c_portaltest, c_portalpass, c_portalcheck; 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 int c_chains;
Q_EXTERN byte *vismap, *vismap_p, *vismap_end; Q_EXTERN byte *vismap, *vismap_p, *vismap_end;

2
tools/quake3/q3map2/visflow.c
View File

@ -72,8 +72,6 @@ int CountBits( byte *bits, int numbits ){
} }
int c_fullskip; int c_fullskip;
int c_portalskip, c_leafskip;
int c_vistest, c_mighttest;
int c_chop, c_nochop; int c_chop, c_nochop;