summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-06-02 19:46:05 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-06-02 19:46:18 +0900
commit9b50043ea9e20c15a1be6735e533f5cc25a253ca (patch)
treed676b90d3c46a948614e1909611c80c9bb4364bf
parent275fc32d588fb6d2b78038f5a97cc2bcd2cd61dc (diff)
gallium: Hopefully fix the cosf/sinf/etc. conditional compolation logic for good.
-rw-r--r--src/gallium/include/pipe/p_util.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/include/pipe/p_util.h b/src/gallium/include/pipe/p_util.h
index 9497eeeec9..cb3cd264e9 100644
--- 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