Always define int32_t in compiler headers.

eglplatform.h no longer defines int32_t.

diff --git a/include/c99/stdint.h b/include/c99/stdint.h
index e3802135be8203db525ce44af4ea1b567df9dbaf..fc6459d03d2b4ac0de7b112862b4bf5856938665 100644 (file)
--- a/include/c99/stdint.h
+++ b/include/c99/stdint.h
@@ -94,9 +94,7 @@ typedef __int8             int8_t;
 typedef unsigned __int8    uint8_t;
 typedef __int16            int16_t;
 typedef unsigned __int16   uint16_t;
-#ifndef __eglplatform_h_
 typedef __int32            int32_t;
-#endif
 typedef unsigned __int32   uint32_t;
 typedef __int64            int64_t;
 typedef unsigned __int64   uint64_t;

diff --git a/src/egl/main/eglcompiler.h b/src/egl/main/eglcompiler.h
index 401a9cf56adc3b2801909cd70f68c1785fefc466..6ecee51d7cadfd90a04e92c24fdd28293afd9ef2 100644 (file)
--- a/src/egl/main/eglcompiler.h
+++ b/src/egl/main/eglcompiler.h
@@ -12,9 +12,7 @@
    typedef unsigned __int8    uint8_t;
    typedef __int16            int16_t;
    typedef unsigned __int16   uint16_t;
-#  ifndef __eglplatform_h_
-     typedef __int32            int32_t;
-#  endif
+   typedef __int32            int32_t;
    typedef unsigned __int32   uint32_t;
    typedef __int64            int64_t;
    typedef unsigned __int64   uint64_t;

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index efd8057608c00c32d1bc2288fe9a44cc1534785e..e0507ccf8643dfc029836f61e7095787f06f1b5d 100644 (file)
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -65,9 +65,7 @@ extern "C" {
    typedef unsigned __int8    uint8_t;
    typedef __int16            int16_t;
    typedef unsigned __int16   uint16_t;
-#  ifndef __eglplatform_h_
-     typedef __int32            int32_t;
-#  endif
+   typedef __int32            int32_t;
    typedef unsigned __int32   uint32_t;
    typedef __int64            int64_t;
    typedef unsigned __int64   uint64_t;