Merge branch 'gdefos' into 'master'

[xonotic/netradiant.git] / tools / quake2 / q2map / q2map.h

diff --git a/tools/quake2/q2map/q2map.h b/tools/quake2/q2map/q2map.h
index 644f7b9e88fda0a536d8eaaa01fef6c974823666..8f4ac8d3eaabea9b815d123f1743fda41bc0e023 100644 (file)
--- a/tools/quake2/q2map/q2map.h
+++ b/tools/quake2/q2map/q2map.h
@@ -23,19 +23,13 @@
 #include "globaldefs.h"
 
 /* platform-specific */
-#if GDEF_OS_LINUX || GDEF_OS_MACOS
-       #define Q_UNIX
-#endif
-
-#ifdef Q_UNIX
+#if GDEF_OS_WINDOWS
+       #include <windows.h>
+#else // !GDEF_OS_WINDOWS
        #include <unistd.h>
        #include <pwd.h>
        #include <limits.h>
-#endif
-
-#if GDEF_OS_WINDOWS
-       #include <windows.h>
-#endif
+#endif // !GDEF_OS_WINDOWS
 
 #include <stdlib.h>