From: Thomas Debesse Date: Sun, 4 Mar 2018 17:10:07 +0000 (+0100) Subject: drop old MAC_STATIC_HACK no one requested to be enabled in 12 years X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d3bcf2f5482f883da28116cf87abc30b94064ee4;p=xonotic%2Fnetradiant.git 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 0fb78ac4..4cb3e4fe 100644 --- 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 diff --git a/tools/quake3/q3map2/mesh.c b/tools/quake3/q3map2/mesh.c index 023afe39..caaffa94 100644 --- 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 3b3949ce..82ff09a7 100644 --- 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 8200f01f..0f90e712 100644 --- 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