[Mesa-dev] [Bug 70743] Compilation on VS2013

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=70743

--- Comment #3 from Scott Graham <scott.freedesktop at h4ck3r.net> ---
Comment on attachment 87961
  --> https://bugs.freedesktop.org/attachment.cgi?id=87961
compile fix for vs2013

Index: include/c99/stdbool.h
===================================================================
--- include/c99/stdbool.h    (revision 229946)
+++ include/c99/stdbool.h    (working copy)
@@ -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

Index: src/mesa/main/querymatrix.c
===================================================================
--- src/mesa/main/querymatrix.c    (revision 229946)
+++ src/mesa/main/querymatrix.c    (working copy)
@@ -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 @@
             return FP_NAN;
     }
 }
+#endif  // _MSC_VER < 1800

 #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
      defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) ||
\

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20131021/9c875ca1/attachment.html>