From f99cdcd1fa09230dd6483b4525a6387699cb1bcf Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@jsg.id.au>
Date: Thu, 25 Apr 2013 15:52:11 +1000
Subject: [PATCH] leave the masm assembly to msvc

---
 codemp/game/q_math.c      | 5 +----
 codemp/qcommon/common.cpp | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/codemp/game/q_math.c b/codemp/game/q_math.c
index 3e1ce48..63e766c 100644
--- a/codemp/game/q_math.c
+++ b/codemp/game/q_math.c
@@ -802,9 +802,7 @@ int BoxOnPlaneSide2 (vec3_t emins, vec3_t emaxs, struct cplane_s *p)
 
 ==================
 */
-#if !( (defined __linux__ || __FreeBSD__) && (defined __i386__) && (!defined C_ONLY)) // rb010123
-
-#if defined __LCC__ || defined C_ONLY || !id386
+#ifndef _MSC_VER
 
 int BoxOnPlaneSide (vec3_t emins, vec3_t emaxs, struct cplane_s *p)
 {
@@ -1103,7 +1101,6 @@ Lerror:
 }
 #pragma warning( default: 4035 )
 
-#endif
 #endif
 
 /*
diff --git a/codemp/qcommon/common.cpp b/codemp/qcommon/common.cpp
index 5411b8a..92777ae 100644
--- a/codemp/qcommon/common.cpp
+++ b/codemp/qcommon/common.cpp
@@ -1809,8 +1809,7 @@ void Com_Shutdown (void)
 */
 }
 
-#if !( defined __linux__ || defined __FreeBSD__ )  // r010123 - include FreeBSD 
-#if ((!id386) && (!defined __i386__)) // rcg010212 - for PPC
+#if !(defined(_MSVC_VER) && defined(id386))
 
 void Com_Memcpy (void* dest, const void* src, const size_t count)
 {
@@ -2121,7 +2120,6 @@ skipClamp:
 	}
 }
 
-#endif 
 #endif // bk001208 - memset/memcpy assembly, Q_acos needed (RC4)
 //------------------------------------------------------------------------