diff options
| author | Hans <hans@chromium.org> | 2014-03-01 11:28:18 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-03-11 11:49:52 -0700 |
| commit | 518526700ed7ab58067cd7d7e0ab9739895314d4 (patch) | |
| tree | 368b3cd1d6fab824c7f87de857c9337b0249d818 | |
| parent | 2f9e7f63945f2ace1c3a50d8618864a861ff64e0 (diff) | |
| download | mesa-518526700ed7ab58067cd7d7e0ab9739895314d4.tar.gz | |
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>
(cherry picked from commit 837da9bdaec2b4496c6d25ea0379f8c2996ed697)
| -rw-r--r-- | src/mesa/main/imports.h | 2 |
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; } |