diff options
| author | Scott Graham <scott.freedesktop@h4ck3r.net> | 2013-10-22 08:37:44 -0600 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2013-10-25 17:18:37 -0700 |
| commit | 6e557f03f3e5222eb8bee829c6b1af27ef525237 (patch) | |
| tree | 9e50a6f54b3b4839aec5ac91adee92ad03ba3a2e | |
| parent | 7ab2b8c4c4607817c91946dcba943b29f1bd1895 (diff) | |
mesa: fixes for MSVC 2013
Cc: "9.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit dafa97fed9c99e0d0c783d913717229378b575da)
| -rw-r--r-- | include/c99/stdbool.h | 3 | ||||
| -rw-r--r-- | src/mesa/main/querymatrix.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/c99/stdbool.h b/include/c99/stdbool.h index 99a735dfa76..99af1a021bf 100644 --- a/include/c99/stdbool.h +++ b/include/c99/stdbool.h @@ -35,7 +35,8 @@ #define bool _Bool /* For compilers that don't have the builtin _Bool type. */ -#if defined(_MSC_VER) || (__STDC_VERSION__ < 199901L && __GNUC__ < 3) +#if (defined(_MSC_VER) && _MSC_VER < 1800) || \ + (defined __GNUC__&& __STDC_VERSION__ < 199901L && __GNUC__ < 3) typedef unsigned char _Bool; #endif diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c index aee8aef129e..19a8e92017e 100644 --- a/src/mesa/main/querymatrix.c +++ b/src/mesa/main/querymatrix.c @@ -38,6 +38,7 @@ #define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0)) #if defined(_MSC_VER) +#if _MSC_VER < 1800 /* Not required on VS2013 and above. */ /* Oddly, the fpclassify() function doesn't exist in such a form * on MSVC. This is an implementation using slightly different * lower-level Windows functions. @@ -70,6 +71,7 @@ fpclassify(double x) return FP_NAN; } } +#endif /* _MSC_VER < 1800 */ #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \ |