Attachment 87963 Details for Bug 70743 – fix compilation on 2013

fix compilation on 2013

correct-patch.diff (text/plain), 1.29 KB, created by Scott Graham on 2013-10-21 23:37:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott Graham

Created: 2013-10-21 23:37:31 UTC

Size: 1.29 KB

patch

obsolete

>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__) || \

Actions: View

Attachments on bug 70743: 87961 | 87963

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.