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 7303263cd688bffcc6b49d0d249229553393407e..8f4ac8d3eaabea9b815d123f1743fda41bc0e023 100644 (file)
--- a/tools/quake2/q2map/q2map.h
+++ b/tools/quake2/q2map/q2map.h
@@ -1,39 +1,35 @@
 /*
-Copyright (C) 1999-2007 id Software, Inc. and contributors.
-For a list of contributors, see the accompanying CONTRIBUTORS file.
+   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.
+   This file is part of GtkRadiant.
 
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   GtkRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GtkRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 // q2map.h
 
-/* platform-specific */
-#if defined( __linux__ ) || defined( __APPLE__ )
-       #define Q_UNIX
-#endif
+#include "globaldefs.h"
 
-#ifdef Q_UNIX
+/* platform-specific */
+#if GDEF_OS_WINDOWS
+       #include <windows.h>
+#else // !GDEF_OS_WINDOWS
        #include <unistd.h>
        #include <pwd.h>
        #include <limits.h>
-#endif
-
-#ifdef _WIN32
-       #include <windows.h>
-#endif
+#endif // !GDEF_OS_WINDOWS
 
 #include <stdlib.h>
 
@@ -45,6 +41,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "bspfile.h"
 #include "inout.h"
 
-int BSP_Main ();
-int VIS_Main ();
-int RAD_Main ();
+int BSP_Main();
+int VIS_Main();
+int RAD_Main();