drop old MAC_STATIC_HACK no one requested to be enabled in 12 years

diff --git a/tools/quake3/common/threads.c b/tools/quake3/common/threads.c
index 0fb78ac4bd5963251b6c9a165fd38bdc2403c1f6..4cb3e4fee061a7f70e28ca20db843c4eaef32989 100644 (file)
--- a/tools/quake3/common/threads.c
+++ b/tools/quake3/common/threads.c
@@ -426,7 +426,7 @@ void RunThreadsOn( int workcnt, qboolean showpacifier, void ( *func )( int ) ){
    =======================================================================
  */
 
-#if GDEF_OS_LINUX || ( GDEF_OS_MACOS && !MAC_STATIC_HACK )
+#if GDEF_OS_LINUX || GDEF_OS_MACOS
 #define USED
 
 #include <unistd.h>

diff --git a/tools/quake3/q3map2/mesh.c b/tools/quake3/q3map2/mesh.c
index 023afe392fc21f8359e6c8d4f7f3926b14a22d2c..caaffa94ba4eabe68a84275a69540d30b04b5951 100644 (file)
--- a/tools/quake3/q3map2/mesh.c
+++ b/tools/quake3/q3map2/mesh.c
@@ -381,8 +381,7 @@ mesh_t *SubdivideMesh( mesh_t in, float maxError, float minLength ){
        float len;
        mesh_t out;
 
-       /* ydnar: static for os x */
-       MAC_STATIC bspDrawVert_t expand[MAX_EXPANDED_AXIS][MAX_EXPANDED_AXIS];
+       bspDrawVert_t expand[MAX_EXPANDED_AXIS][MAX_EXPANDED_AXIS];
 
 
        out.width = in.width;
@@ -547,8 +546,7 @@ mesh_t *SubdivideMesh2( mesh_t in, int iterations ){
        bspDrawVert_t prev, next, mid;
        mesh_t out;
 
-       /* ydnar: static for os x */
-       MAC_STATIC bspDrawVert_t expand[ MAX_EXPANDED_AXIS ][ MAX_EXPANDED_AXIS ];
+       bspDrawVert_t expand[ MAX_EXPANDED_AXIS ][ MAX_EXPANDED_AXIS ];
 
 
        /* initial setup */
@@ -654,8 +652,7 @@ mesh_t *RemoveLinearMeshColumnsRows( mesh_t *in ) {
        vec3_t proj, dir;
        mesh_t out;
 
-       /* ydnar: static for os x */
-       MAC_STATIC bspDrawVert_t expand[MAX_EXPANDED_AXIS][MAX_EXPANDED_AXIS];
+       bspDrawVert_t expand[MAX_EXPANDED_AXIS][MAX_EXPANDED_AXIS];
 
 
        out.width = in->width;

diff --git a/tools/quake3/q3map2/patch.c b/tools/quake3/q3map2/patch.c
index 3b3949ced6ede9147272e7c0f28db19792966a98..82ff09a7e1498c225f82671f4318dfbf17f69fb1 100644 (file)
--- a/tools/quake3/q3map2/patch.c
+++ b/tools/quake3/q3map2/patch.c
@@ -428,10 +428,9 @@ void PatchMapDrawSurfs( entity_t *e ){
        vec3_t bounds[ 2 ];
        byte                    *bordering;
 
-       /* ydnar: mac os x fails with these if not static */
-       MAC_STATIC parseMesh_t  *meshes[ MAX_MAP_DRAW_SURFS ];
-       MAC_STATIC qb_t grouped[ MAX_MAP_DRAW_SURFS ];
-       MAC_STATIC byte group[ MAX_MAP_DRAW_SURFS ];
+       parseMesh_t  *meshes[ MAX_MAP_DRAW_SURFS ];
+       qb_t grouped[ MAX_MAP_DRAW_SURFS ];
+       byte group[ MAX_MAP_DRAW_SURFS ];
 
 
        /* note it */

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 8200f01f1b3a8abea1c6feb1f5628e5ea6fb47c4..0f90e712b71fd29d845547bd27f93ffaa7fe469c 100644 (file)
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -93,13 +93,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