Bug 70743

Summary: Compilation on VS2013
Product: Mesa Reporter: Scott Graham <scott.freedesktop>
Component: Mesa coreAssignee: mesa-dev
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: medium CC: marchesin
Version: unspecified   
Hardware: Other   
OS: All   
Whiteboard:
i915 platform: i915 features:
Attachments: compile fix for vs2013
fix compilation on 2013

Description Scott Graham 2013-10-21 23:32:10 UTC

    
Comment 1 Scott Graham 2013-10-21 23:33:06 UTC
Doesn't compile due to changes in VS2013's standard library.
Comment 2 Scott Graham 2013-10-21 23:33:44 UTC
Created attachment 87961 [details]
compile fix for vs2013
Comment 3 Scott Graham 2013-10-21 23:35:05 UTC
Comment on attachment 87961 [details]
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__) || \
Comment 4 Scott Graham 2013-10-21 23:37:31 UTC
Created attachment 87963 [details]
fix compilation on 2013
Comment 5 Brian Paul 2013-10-22 14:40:08 UTC
Thanks.  I'm committing this to master and tagging for the 9.2 branch.
dafa97fed9c99e0d0c783d913717229378b575da

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.