Mesa (master): egl: Don't attempt to redefine stdint.h types with VS 2010.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Fri May 2 21:06:31 UTC 2014


Module: Mesa
Branch: master
Commit: ade79b21e9bce776beff079cc5017e13a0099fcb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ade79b21e9bce776beff079cc5017e13a0099fcb

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu May  1 14:16:08 2014 +0100

egl: Don't attempt to redefine stdint.h types with VS 2010.

Just include stdint.h.

Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>

---

 src/egl/main/eglcompiler.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/egl/main/eglcompiler.h b/src/egl/main/eglcompiler.h
index 53dab54..5ea83d6 100644
--- a/src/egl/main/eglcompiler.h
+++ b/src/egl/main/eglcompiler.h
@@ -37,7 +37,8 @@
 /**
  * Get standard integer types
  */
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
+    (defined(_MSC_VER) && _MSC_VER >= 1600)
 #  include <stdint.h>
 #elif defined(_MSC_VER)
    typedef __int8             int8_t;




More information about the mesa-commit mailing list