3 files changed, 2 insertions, 11 deletions
diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index d7e8db5..c27afec 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -894,12 +894,7 @@ void R_Register( void )
 	r_vertexLight = ri.Cvar_Get( "r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_uiFullScreen = ri.Cvar_Get( "r_uifullscreen", "0", 0);
 	r_subdivisions = ri.Cvar_Get ("r_subdivisions", "4", CVAR_ARCHIVE | CVAR_LATCH);
-#if (defined(MACOS_X) || defined(__linux__)) && defined(SMP)
-  // Default to using SMP on Mac OS X or Linux if we have multiple processors
-	r_smp = ri.Cvar_Get( "r_smp", Sys_ProcessorCount() > 1 ? "1" : "0", CVAR_ARCHIVE | CVAR_LATCH);
-#else        
 	r_smp = ri.Cvar_Get( "r_smp", "0", CVAR_ARCHIVE | CVAR_LATCH);
-#endif
 	r_ignoreFastPath = ri.Cvar_Get( "r_ignoreFastPath", "1", CVAR_ARCHIVE | CVAR_LATCH );
 
 	//
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index d5355b2..fc1b464 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 typedef unsigned int glIndex_t;
 
 // fast float to int conversion
-#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123
+#if id386 && !( (defined __GNUC__ ) && (defined __i386__ ) ) // rb010123
 long myftol( float f );
 #else
 #define	myftol(x) ((int)(x))
diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c
index ca6f07c..ae33c51 100644
--- a/code/renderer/tr_shade_calc.c
+++ b/code/renderer/tr_shade_calc.c
@@ -1022,17 +1022,13 @@ void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
 
 
 
-#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123
+#if id386 && !( (defined __GNUC__ ) && (defined __i386__ ) ) // rb010123
 
 long myftol( float f ) {
-#ifndef __MINGW32__
 	static int tmp;
 	__asm fld f
 	__asm fistp tmp
 	__asm mov eax, tmp
-#else
-	return (long)f;
-#endif
 }
 
 #endif