Merge commit '515673c08f8718a237e90c2130a1f5294f966d6a'

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

diff --git a/tools/quake2/common/cmdlib.h b/tools/quake2/common/cmdlib.h
index 02ced5bea779e0865c0ca189b58c6123a8a80eb2..5b08b81a17fdc87be943d3c878647d9ad07c892c 100644 (file)
--- a/tools/quake2/common/cmdlib.h
+++ b/tools/quake2/common/cmdlib.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 1999-2007 id Software, Inc. and contributors.
+Copyright (C) 1999-2006 Id Software, Inc. and contributors.
 For a list of contributors, see the accompanying CONTRIBUTORS file.
 
 This file is part of GtkRadiant.
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <time.h>
 #include <stdarg.h>
 
-#ifdef _WIN32
+#ifdef WIN32
        #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 +40,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
        #endif
 #endif
 
-#ifdef _WIN32
+#ifdef WIN32
        #pragma intrinsic( memset, memcpy )
 #endif
 
@@ -50,7 +50,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   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
 
 /*