From: Hans <hans@chromium.org>
Date: Sat, 1 Mar 2014 18:28:18 +0000 (-0700)
Subject: mesa: don't define c99 math functions for MSVC >= 1800
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=837da9bdaec2b4496c6d25ea0379f8c2996ed697;p=mesa.git

mesa: don't define c99 math functions for MSVC >= 1800

Signed-off-by: Brian Paul <brianp@vmware.com>
Cc: "10.0" "10.1" <mesa-stable@lists.freedesktop.org>
---

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; }