summaryrefslogtreecommitdiffstats
path: root/src/gallium/include/pipe
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2008-04-21 14:19:15 +0100
committerKeith Whitwell <[email protected]>2008-04-21 14:19:15 +0100
commit76a3590046d74c923d9837f82ece1587224b9a41 (patch)
treee9394178fd6f12f0343249082cee57f0e989d7f1 /src/gallium/include/pipe
parent615cdd3a535bb71754baa8b37e79b85af01854dd (diff)
util: work around freaky win32 math.h
Diffstat (limited to 'src/gallium/include/pipe')
-rw-r--r--src/gallium/include/pipe/p_util.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/include/pipe/p_util.h b/src/gallium/include/pipe/p_util.h
index 77783b11a88..43d94ec4ba8 100644
--- a/src/gallium/include/pipe/p_util.h
+++ b/src/gallium/include/pipe/p_util.h
@@ -405,6 +405,8 @@ extern void pipe_copy_rect(ubyte * dst, unsigned cpp, unsigned dst_pitch,
#ifdef WIN32
+#if !defined(_INC_MATH) || !defined(__cplusplus)
+
static INLINE float cosf( float f )
{
return (float) cos( (double) f );
@@ -444,7 +446,7 @@ static INLINE float logf( float f )
{
return (float) cos( (double) f );
}
-
+#endif /* _INC_MATH */
#endif