diff options
| author | Hans <[email protected]> | 2014-03-01 11:26:09 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2014-03-03 11:56:30 -0700 |
| commit | bf2566032589e0c46dbd4ddef0d75d354d2a16b5 (patch) | |
| tree | 3c6a0dadaf702676675fd7a44504e8394392cca5 | |
| parent | aff7c5e78ab133866a90f67613508735c9b75094 (diff) | |
util: don't define isfinite(), isnan() for MSVC >= 1800
Signed-off-by: Brian Paul <[email protected]>
Cc: "10.0" "10.1" <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/util/u_math.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h index ffbcc4cbfea..ec03e4e5886 100644 --- a/src/gallium/auxiliary/util/u_math.h +++ b/src/gallium/auxiliary/util/u_math.h @@ -112,10 +112,13 @@ static INLINE float logf( float f ) #define logf(x) ((float)log((double)(x))) #endif /* logf */ +#if _MSC_VER < 1800 #define isfinite(x) _finite((double)(x)) #define isnan(x) _isnan((double)(x)) +#endif /* _MSC_VER < 1800 */ #endif /* _MSC_VER < 1400 && !defined(__cplusplus) */ +#if _MSC_VER < 1800 static INLINE double log2( double x ) { const double invln2 = 1.442695041; @@ -133,6 +136,7 @@ roundf(float x) { return x >= 0.0f ? floorf(x + 0.5f) : ceilf(x - 0.5f); } +#endif #define INFINITY (DBL_MAX + DBL_MAX) #define NAN (INFINITY - INFINITY) |