From d37fe69f85b26ccfea6b77cbeb365595db39758e Mon Sep 17 00:00:00 2001 From: dhewg Date: Thu, 22 Dec 2011 11:46:24 +0100 Subject: [PATCH] Change another _WIN32 to _MSC_VER for MinGW Older MinGW versions do not know about __assume(). Change _WIN32 in comments too to match their opening #if. Reported by serpentine. --- neo/idlib/math/Simd_3DNow.cpp | 2 +- neo/idlib/math/Simd_Generic.cpp | 2 +- neo/idlib/math/Simd_SSE2.cpp | 2 +- neo/idlib/math/Simd_SSE3.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/neo/idlib/math/Simd_3DNow.cpp b/neo/idlib/math/Simd_3DNow.cpp index fc877f99..194a4912 100644 --- a/neo/idlib/math/Simd_3DNow.cpp +++ b/neo/idlib/math/Simd_3DNow.cpp @@ -290,4 +290,4 @@ $memcpy_final: } } -#endif /* _WIN32 */ +#endif /* _MSC_VER */ diff --git a/neo/idlib/math/Simd_Generic.cpp b/neo/idlib/math/Simd_Generic.cpp index f4d0fd54..c20f6a4d 100644 --- a/neo/idlib/math/Simd_Generic.cpp +++ b/neo/idlib/math/Simd_Generic.cpp @@ -49,7 +49,7 @@ If you have questions concerning this license or the applicable additional terms #ifdef _DEBUG #define NODEFAULT default: assert( 0 ) -#elif _WIN32 +#elif _MSC_VER #define NODEFAULT default: __assume( 0 ) #else #define NODEFAULT diff --git a/neo/idlib/math/Simd_SSE2.cpp b/neo/idlib/math/Simd_SSE2.cpp index 986f8d80..1a4b4a9e 100644 --- a/neo/idlib/math/Simd_SSE2.cpp +++ b/neo/idlib/math/Simd_SSE2.cpp @@ -872,4 +872,4 @@ void VPCALL idSIMD_SSE2::MixedSoundToSamples( short *samples, const float *mixBu } } -#endif /* _WIN32 */ +#endif /* _MSC_VER */ diff --git a/neo/idlib/math/Simd_SSE3.cpp b/neo/idlib/math/Simd_SSE3.cpp index 4ecd7994..8ea6d5d6 100644 --- a/neo/idlib/math/Simd_SSE3.cpp +++ b/neo/idlib/math/Simd_SSE3.cpp @@ -362,4 +362,4 @@ void VPCALL idSIMD_SSE3::TransformVerts( idDrawVert *verts, const int numVerts, #endif } -#endif /* _WIN32 */ +#endif /* _MSC_VER */