qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-24 20:51:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[build] Fix some build issues caused by using tracy

Browse source 
Mostly just macro conflicts (and a little white space in passing).
Commits for integrating tracy will come later when I've come up with a
wrapper-api that I like (so non-tracy builds are easy even with tracy
available).
This commit is contained in:
Bill Currie 2023-11-28 13:54:18 +09:00
parent 962043ca59
commit 2a80614273
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/gib/regex.c
View file

@ -24,7 +24,9 @@
#pragma alloca #pragma alloca
#endif #endif
#ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#endif
/* We need this for `regex.h', and perhaps for the Emacs include files. */ /* We need this for `regex.h', and perhaps for the Emacs include files. */
#include <sys/types.h> #include <sys/types.h>
@ -241,8 +243,12 @@ char *alloca ();
#define STREQ(s1, s2) ((strcmp (s1, s2) == 0)) #define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
#ifndef MAX
#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b))
#endif
#ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
#endif
typedef char boolean; typedef char boolean;
#define false 0 #define false 0

2
libs/ruamoko/rua_math.c
View file

@ -31,7 +31,9 @@
# include "config.h" # include "config.h"
#endif #endif
#ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#endif
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>

4
libs/ruamoko/rua_stdlib.c
View file

@ -31,7 +31,9 @@
# include "config.h" # include "config.h"
#endif #endif
#define _GNU_SOURCE // for qsort_r #ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
# include <string.h> # include <string.h>

2
nq/source/cl_parse.c
View file

@ -787,7 +787,7 @@ CL_ParseServerMessage (void)
case svc_version: case svc_version:
i = MSG_ReadLong (net_message); i = MSG_ReadLong (net_message);
if (i != PROTOCOL_NETQUAKE && i!= PROTOCOL_FITZQUAKE) if (i != PROTOCOL_NETQUAKE && i != PROTOCOL_FITZQUAKE)
Host_Error ("CL_ParseServerMessage: Server is protocol %i " Host_Error ("CL_ParseServerMessage: Server is protocol %i "
"instead of %i or %i\n", i, PROTOCOL_NETQUAKE, "instead of %i or %i\n", i, PROTOCOL_NETQUAKE,
PROTOCOL_FITZQUAKE); PROTOCOL_FITZQUAKE);