mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-02-24 20:51:35 +00:00
[build] Fix some build issues caused by using tracy
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:
parent
962043ca59
commit
2a80614273
4 changed files with 12 additions and 2 deletions
|
@ -24,7 +24,9 @@
|
|||
#pragma alloca
|
||||
#endif
|
||||
|
||||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE
|
||||
#endif
|
||||
|
||||
/* We need this for `regex.h', and perhaps for the Emacs include files. */
|
||||
#include <sys/types.h>
|
||||
|
@ -241,8 +243,12 @@ char *alloca ();
|
|||
|
||||
#define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
|
||||
|
||||
#ifndef MAX
|
||||
#define MAX(a, b) ((a) > (b) ? (a) : (b))
|
||||
#endif
|
||||
#ifndef MIN
|
||||
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
||||
#endif
|
||||
|
||||
typedef char boolean;
|
||||
#define false 0
|
||||
|
|
|
@ -31,7 +31,9 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
|
||||
|
|
|
@ -31,7 +31,9 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#define _GNU_SOURCE // for qsort_r
|
||||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRING_H
|
||||
# include <string.h>
|
||||
|
|
|
@ -787,7 +787,7 @@ CL_ParseServerMessage (void)
|
|||
|
||||
case svc_version:
|
||||
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 "
|
||||
"instead of %i or %i\n", i, PROTOCOL_NETQUAKE,
|
||||
PROTOCOL_FITZQUAKE);
|
||||
|
|
Loading…
Reference in a new issue