gallium: Hopefully fix the cosf/sinf/etc. conditional compolation logic for good.

diff --git a/src/gallium/include/pipe/p_util.h b/src/gallium/include/pipe/p_util.h
index 9497eeeec9b55af448be00dbe8d6461156e6eae9..cb3cd264e910494d4271181d67d5e33644210d4d 100644 (file)
--- a/src/gallium/include/pipe/p_util.h
+++ b/src/gallium/include/pipe/p_util.h
@@ -410,8 +410,7 @@ extern void pipe_copy_rect(ubyte * dst, unsigned cpp, unsigned dst_pitch,
 
 
 
-#if !defined(_MSC_VER) || _MSC_VER < 0x800
-#if !defined(_INC_MATH) || !defined(__cplusplus)
+#if defined(_MSC_VER) && !defined(__cplusplus)
 
 static INLINE float cosf( float f ) 
 {
@@ -453,7 +452,6 @@ static INLINE float logf( float f )
    return (float) cos( (double) f );
 }
 
-#endif  /* _INC_MATH */
 #endif