thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

c++: Make some defines C++-valid

Browse source
This commit is contained in:
Eidolon 2022-12-12 16:38:25 -06:00
parent dceeadd3aa
commit 15acefcc33
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/doomdef.h
View file

@ -126,10 +126,10 @@ extern char logfilename[1024];
// VERSIONSTRING_RC is for the resource-definition script used by windows builds // VERSIONSTRING_RC is for the resource-definition script used by windows builds
#else #else
#ifdef BETAVERSION #ifdef BETAVERSION
#define VERSIONSTRING "v"SRB2VERSION" "BETAVERSION #define VERSIONSTRING "v" SRB2VERSION " " BETAVERSION
#define VERSIONSTRING_RC SRB2VERSION " " BETAVERSION "\0" #define VERSIONSTRING_RC SRB2VERSION " " BETAVERSION "\0"
#else #else
#define VERSIONSTRING "v"SRB2VERSION #define VERSIONSTRING "v" SRB2VERSION
#define VERSIONSTRING_RC SRB2VERSION "\0" #define VERSIONSTRING_RC SRB2VERSION "\0"
#endif #endif
// Hey! If you change this, add 1 to the MODVERSION below! // Hey! If you change this, add 1 to the MODVERSION below!
@ -614,12 +614,14 @@ UINT32 quickncasehash (const char *p, size_t n)
return x; return x;
} }
#ifndef __cplusplus
#ifndef min // Double-Check with WATTCP-32's cdefs.h #ifndef min // Double-Check with WATTCP-32's cdefs.h
#define min(x, y) (((x) < (y)) ? (x) : (y)) #define min(x, y) (((x) < (y)) ? (x) : (y))
#endif #endif
#ifndef max // Double-Check with WATTCP-32's cdefs.h #ifndef max // Double-Check with WATTCP-32's cdefs.h
#define max(x, y) (((x) > (y)) ? (x) : (y)) #define max(x, y) (((x) > (y)) ? (x) : (y))
#endif #endif
#endif
// Max gamepad/joysticks that can be detected/used. // Max gamepad/joysticks that can be detected/used.
#define MAX_JOYSTICKS 4 #define MAX_JOYSTICKS 4