diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 01:09:21 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 01:09:21 +0000 |
| commit | e740c825b11773ebe636675977e5f79de253c745 (patch) | |
| tree | bdc29876d4c984e6ab2910969b2fe141bab7955c | |
| parent | 009d829daee69743d77f4eaea702633a2fd5d7c6 (diff) | |
| download | src-e740c825b11773ebe636675977e5f79de253c745.tar.gz | |
mesa compile fixes for VS2013
- _Bool is defined in standard headers now
- fpclassify is in the standard library
R=marcheu@chromium.org
BUG=288948
Review URL: https://codereview.chromium.org/32323009
git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@229994 0039d316-1c4b-4281-b951-d872f2087c98
| -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 99a735d..99af1a0 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 2843d55..6c456ab 100644 --- a/src/mesa/main/querymatrix.c +++ b/src/mesa/main/querymatrix.c @@ -37,6 +37,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. @@ -69,6 +70,7 @@ fpclassify(double x) return FP_NAN; } } +#endif /* _MSC_VER < 1800 */ #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \ |