ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-09 23:01:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix various duplicate definition link errors, picked up by gcc 10

Browse source
This commit is contained in:
Timothee 'TTimo' Besset 2020-07-04 16:08:41 -05:00
parent 78b32daef8
commit 6f98213cc2
6 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/quake3/common/inout.c
View file

@ -58,8 +58,6 @@ UINT wm_BroadcastCommand = -1;
socket_t *brdcst_socket;
netmessage_t msg;
qboolean verbose = qfalse;
// our main document
// is streamed through the network to Radiant
// possibly written to disk at the end of the run

4
tools/quake3/q3data/q3data.c
View file

@ -22,11 +22,13 @@
#ifdef WIN32
#include <io.h>
#endif
#include "q3data.h"
#include "md3lib.h"
#include "vfs.h"
qboolean verbose;
qboolean g_verbose;
qboolean g_stripify = qtrue;
qboolean g_release; // don't grab, copy output data to new tree
@ -37,8 +39,6 @@ qboolean g_skipmodel; // set true when a cd is not g_only
// bogus externs for some TA hacks (common/ using them against q3map)
char *moddir = NULL;
// some old defined that was in cmdlib lost during merge
char writedir[1024];
#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
#define strlwr strlower

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

@ -978,10 +978,8 @@ typedef enum
}
surfaceType_t;
#ifdef MAIN_C
char *surfaceTypes[ NUM_SURFACE_TYPES ]
#ifndef MAIN_C
;
#else
=
{
"SURFACE_BAD",
@ -996,6 +994,8 @@ char *surfaceTypes[ NUM_SURFACE_TYPES ]
"SURFACE_DECAL",
"SURFACE_SHADER"
};
#else
extern char *surfaceTypes[ NUM_SURFACE_TYPES ];
#endif

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

@ -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;

6
tools/urt/tools/quake3/q3map2/q3map2.h
View file

@ -945,10 +945,8 @@ typedef enum
}
surfaceType_t;
#ifdef MAIN_C
char *surfaceTypes[ NUM_SURFACE_TYPES ]
#ifndef MAIN_C
;
#else
=
{
"SURFACE_BAD",
@ -963,6 +961,8 @@ char *surfaceTypes[ NUM_SURFACE_TYPES ]
"SURFACE_DECAL",
"SURFACE_SHADER"
};
#else
extern char *surfaceTypes[ NUM_SURFACE_TYPES ];
#endif

2
tools/urt/tools/quake3/q3map2/visflow.c
View file

@ -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;