From 48addd68a8c8d0c026be2d3b87ea6ce23509da91 Mon Sep 17 00:00:00 2001 From: tma Date: Fri, 23 Sep 2005 02:59:15 +0000 Subject: * Replaced lots of __linux__ || __FreeBSD__ with __GNUC__ * MinGW port now uses asm versions of SnapVector and ftol * Improved the handling of mangled symbols in vm_x86.c git-svn-id: svn://svn.icculus.org/quake3/trunk@99 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/game/bg_lib.c | 7 ------- code/game/q_math.c | 9 +++------ 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'code/game') diff --git a/code/game/bg_lib.c b/code/game/bg_lib.c index bf1ac1e..140d18a 100644 --- a/code/game/bg_lib.c +++ b/code/game/bg_lib.c @@ -269,9 +269,6 @@ char *strstr( const char *string, const char *strCharSet ) { } #endif // bk001211 -// bk001120 - presumably needed for Mac -//#if !defined(_MSC_VER) && !defined(__linux__) -// bk001127 - undid undo #if defined ( Q3_VM ) int tolower( int c ) { if ( c >= 'A' && c <= 'Z' ) { @@ -914,10 +911,6 @@ double _atof( const char **stringPtr ) { } -// bk001120 - presumably needed for Mac -//#if !defined ( _MSC_VER ) && ! defined ( __linux__ ) - -// bk001127 - undid undo #if defined ( Q3_VM ) int atoi( const char *string ) { int sign; diff --git a/code/game/q_math.c b/code/game/q_math.c index aeed2ab..fd835df 100644 --- a/code/game/q_math.c +++ b/code/game/q_math.c @@ -565,11 +565,7 @@ float Q_rsqrt( float number ) y = y * ( threehalfs - ( x2 * y * y ) ); // 1st iteration // y = y * ( threehalfs - ( x2 * y * y ) ); // 2nd iteration, this can be removed -#ifndef Q3_VM -#ifdef __linux__ - assert( !isnan(y) ); // bk010122 - FPE? -#endif -#endif + //assert( !isnan(y) ); // bk010122 - FPE? return y; } @@ -740,7 +736,8 @@ int BoxOnPlaneSide2 (vec3_t emins, vec3_t emaxs, struct cplane_s *p) ================== */ -#if !( (defined __linux__ || __FreeBSD__ || __MINGW32__) && (defined __i386__) && (!defined C_ONLY)) // rb010123 +// if not GNU x86 and configured to use asm +#if !( (defined __GNUC__) && (defined __i386__) && (!defined C_ONLY)) #if defined __LCC__ || defined C_ONLY || !id386 || defined __VECTORC -- cgit v1.2.3