X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fq3map2.h;h=ce37d76c2deabee2311ee478ca0cdc501a34b489;hp=698e57c1bab73b5c9d280fec73f9b7212b0061ea;hb=541bd4cf8df0e316e14a36d82b84cb9cdee20e78;hpb=1483f2b87be32a60ef7e0038f3a893624a3c6639

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 698e57c1..ce37d76c 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -48,11 +48,7 @@
    ------------------------------------------------------------------------------- */
 
 /* platform-specific */
-#if GDEF_OS_LINUX || GDEF_OS_MACOS
-	#define Q_UNIX
-#endif
-
-#ifdef Q_UNIX
+#if GDEF_OS_POSIX
 	#include <unistd.h>
 	#include <pwd.h>
 	#include <limits.h>
@@ -70,7 +66,9 @@
 #include "mathlib.h"
 #include "md5lib.h"
 #include "ddslib.h"
+#ifdef BUILD_CRUNCH
 #include "crn_rgba.h"
+#endif // BUILD_CRUNCH
 
 #include "picomodel.h"
 
@@ -91,13 +89,6 @@
 
    ------------------------------------------------------------------------------- */
 
-#define MAC_STATIC_HACK         0
-#if GDEF_OS_MACOS && MAC_STATIC_HACK
-	#define MAC_STATIC          static
-#else
-	#define MAC_STATIC
-#endif
-
 #if 1
 	#if GDEF_OS_WINDOWS
 		#define Q_stricmp           stricmp
@@ -1959,11 +1950,11 @@ Q_EXTERN game_t games[]
 	{
 								#include "game_quake3.h"
 	,
-								#include "game_quakelive.h" /* most be after game_quake3.h as they share defines! */
+								#include "game_quakelive.h" /* must be after game_quake3.h as they share defines! */
 	,
-								#include "game_nexuiz.h" /* most be after game_quake3.h as they share defines! */
+								#include "game_nexuiz.h" /* must be after game_quake3.h as they share defines! */
 	,
-								#include "game_xonotic.h" /* most be after game_quake3.h as they share defines! */
+								#include "game_xonotic.h" /* must be after game_quake3.h as they share defines! */
 	,
 								#include "game_tremulous.h" /*LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */
 	,
@@ -1973,7 +1964,7 @@ Q_EXTERN game_t games[]
 	,
 								#include "game_wolf.h"
 	,
-								#include "game_wolfet.h" /* most be after game_wolf.h as they share defines! */
+								#include "game_wolfet.h" /* must be after game_wolf.h as they share defines! */
 	,
 								#include "game_etut.h"
 	,
@@ -1981,9 +1972,9 @@ Q_EXTERN game_t games[]
 	,
 								#include "game_sof2.h"
 	,
-								#include "game_jk2.h"   /* most be after game_sof2.h as they share defines! */
+								#include "game_jk2.h"   /* must be after game_sof2.h as they share defines! */
 	,
-								#include "game_ja.h"    /* most be after game_jk2.h as they share defines! */
+								#include "game_ja.h"    /* must be after game_jk2.h as they share defines! */
 	,
 								#include "game_qfusion.h"   /* qfusion game */
 	,