aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHans <[email protected]>2014-03-01 11:28:18 -0700
committerBrian Paul <[email protected]>2014-03-03 11:56:33 -0700
commit837da9bdaec2b4496c6d25ea0379f8c2996ed697 (patch)
tree201c4e744b46902234458d594e01d92157ce6f3f /src
parentbf2566032589e0c46dbd4ddef0d75d354d2a16b5 (diff)
mesa: don't define c99 math functions for MSVC >= 1800
Signed-off-by: Brian Paul <[email protected]> Cc: "10.0" "10.1" <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/imports.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index d79e2a339f3..9e221cccb1e 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -132,7 +132,7 @@ typedef union { GLfloat f; GLint i; GLuint u; } fi_type;
#define atanhf(f) ((float) atanh(f))
#endif
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER < 1800) /* Not req'd on VS2013 and above */
static inline float truncf(float x) { return x < 0.0f ? ceilf(x) : floorf(x); }
static inline float exp2f(float x) { return powf(2.0f, x); }
static inline float log2f(float x) { return logf(x) * 1.442695041f; }