diff options
| author | Keith Whitwell <[email protected]> | 2008-11-19 16:04:18 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-11-19 16:04:18 +0000 |
| commit | 205e0e3e38b99c2fb0298755d99a38f111f0b96f (patch) | |
| tree | 83d39b94c09469f9046a9526721271d175dbe48a /src/gallium/auxiliary | |
| parent | 227a8a2e773452a1e8354a9d48c25b254b6998b9 (diff) | |
| parent | 59ae12b5b14a2bf18c4b566abcdf3211aa5eb4d6 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/util/u_math.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h index 653d79ccd5b..aa4fa17b596 100644 --- a/src/gallium/auxiliary/util/u_math.h +++ b/src/gallium/auxiliary/util/u_math.h @@ -119,6 +119,7 @@ __inline double __cdecl atan2(double val) #if defined(_MSC_VER) + #if _MSC_VER < 1400 && !defined(__cplusplus) || defined(PIPE_SUBSYSTEM_WINDOWS_CE) static INLINE float cosf( float f ) @@ -161,12 +162,6 @@ static INLINE float logf( float f ) return (float) log( (double) f ); } -static INLINE double log2( double x ) -{ - const double invln2 = 1.442695041; - return log( x ) * invln2; -} - #else /* Work-around an extra semi-colon in VS 2005 logf definition */ #ifdef logf @@ -174,6 +169,13 @@ static INLINE double log2( double x ) #define logf(x) ((float)log((double)(x))) #endif /* logf */ #endif + +static INLINE double log2( double x ) +{ + const double invln2 = 1.442695041; + return log( x ) * invln2; +} + #endif /* _MSC_VER */ |