summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2014-05-01 14:16:08 +0100
committerJosé Fonseca <[email protected]>2014-05-02 22:04:47 +0100
commitade79b21e9bce776beff079cc5017e13a0099fcb (patch)
tree91985ca7e593a5c9ac754cdf3b06d7f896f7fbbe
parent979692a52aec5d3c927f77f2602e9d848136e7ac (diff)
egl: Don't attempt to redefine stdint.h types with VS 2010.
Just include stdint.h. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]>
-rw-r--r--src/egl/main/eglcompiler.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/egl/main/eglcompiler.h b/src/egl/main/eglcompiler.h
index 53dab54384a..5ea83d6145a 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;