From 6fc2559179197a0f24b439e831e3278f8623789e Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@jsg.id.au>
Date: Mon, 22 Apr 2013 23:27:09 +1000
Subject: [PATCH] opt out of more masm assembly

---
 code/client/snd_mix.cpp         | 4 +---
 code/renderer/tr_local.h        | 2 +-
 code/renderer/tr_shade_calc.cpp | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/client/snd_mix.cpp b/code/client/snd_mix.cpp
index 22d90cf..bec5f52 100644
--- a/code/client/snd_mix.cpp
+++ b/code/client/snd_mix.cpp
@@ -15,8 +15,7 @@ short	*snd_out;
 
 
 
-#if !(defined __linux__ && defined __i386__)
-#if	!id386
+#if !(defined(_MSC_VER) && defined(__i386__))
 
 
 void S_WriteLinearBlastStereo16 (void)
@@ -132,7 +131,6 @@ LExit:
 }
 
 #endif
-#endif
 
 
 void S_TransferStereo16 (unsigned long *pbuf, int endtime)
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 381672f..9f1ee29 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -23,7 +23,7 @@ typedef unsigned int glIndex_t;
 #endif
 
 // fast float to int conversion
-#if id386 && !(defined __linux__ && defined __i386__)
+#if (defined(_MSC_VER) && defined(__i386__))
 long myftol( float f );
 #else
 #define	myftol(x) ((int)(x))
diff --git a/code/renderer/tr_shade_calc.cpp b/code/renderer/tr_shade_calc.cpp
index bd9a561..80a4a40 100644
--- a/code/renderer/tr_shade_calc.cpp
+++ b/code/renderer/tr_shade_calc.cpp
@@ -1174,7 +1174,7 @@ void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
 
 
 
-#if id386 && !(defined __linux__ && defined __i386__)
+#if (defined(_MSVC_VER) && (defined __i386__))
 #pragma warning(disable: 4035)
 long myftol( float f ) {
 	static int tmp;