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 2955d53f2a966aaa962cb9be569240b89c5b1328..f8d8e0d361a415c2e4996fd651a0cad789393e79 100644 (file)
--- a/tools/quake2/common/cmdlib.h
+++ b/tools/quake2/common/cmdlib.h
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
+   Copyright (C) 1999-2007 id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
    This file is part of GtkRadiant.
@@ -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