Merge branch 'nomagicpath' into 'master'

[xonotic/netradiant.git] / tools / quake2 / common / cmdlib.h

diff --git a/tools/quake2/common/cmdlib.h b/tools/quake2/common/cmdlib.h
index 6cc5fade769cec8f5eaf8dcf0c16aa008a169f2f..f8d8e0d361a415c2e4996fd651a0cad789393e79 100644 (file)
--- a/tools/quake2/common/cmdlib.h
+++ b/tools/quake2/common/cmdlib.h
@@ -24,6 +24,8 @@
 #ifndef __CMDLIB__
 #define __CMDLIB__
 
+#include "globaldefs.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -32,7 +34,7 @@
 #include <time.h>
 #include <stdarg.h>
 
-#ifdef WIN32
+#if GDEF_COMPILER_MSVC
        #ifdef NDEBUG                           // Don't show in a Release build
                #pragma warning(disable : 4305)     // truncate from double to float
                #pragma warning(disable : 4244)     // conversion from double to float
@@ -40,7 +42,7 @@
        #endif
 #endif
 
-#ifdef WIN32
+#if GDEF_COMPILER_MSVC
        #pragma intrinsic( memset, memcpy )
 #endif
 
@@ -50,7 +52,11 @@ typedef enum {false, true} qboolean;
 typedef unsigned char byte;
 #endif
 
+#ifdef PATH_MAX
+#define MAX_OS_PATH     PATH_MAX
+#else
 #define MAX_OS_PATH     1024
+#endif
 #define MEM_BLOCKSIZE 4096
 
 /*