OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: fixes for MSVC 2013

Browse Source 
Cc: "9.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Scott Graham
2013-10-22 08:37:44 -06:00
committed by Brian Paul
parent 65ee044a97
commit dafa97fed9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/c99/stdbool.h
View File

@@ -35,7 +35,8 @@
#define bool _Bool #define bool _Bool
/* For compilers that don't have the builtin _Bool type. */ /* 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; typedef unsigned char _Bool;
#endif #endif

2
src/mesa/main/querymatrix.c
View File

@@ -38,6 +38,7 @@
#define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0)) #define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0))
#if defined(_MSC_VER) #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 /* Oddly, the fpclassify() function doesn't exist in such a form
* on MSVC. This is an implementation using slightly different * on MSVC. This is an implementation using slightly different
* lower-level Windows functions. * lower-level Windows functions.
@@ -70,6 +71,7 @@ fpclassify(double x)
return FP_NAN; return FP_NAN;
} }
} }
#endif /* _MSC_VER < 1800 */
#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \ defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \