From d2cb99904578b263396752975d60c8d7e2eac14b Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 31 May 2010 10:58:47 +0800 Subject: Always define int32_t in compiler headers. eglplatform.h no longer defines int32_t. --- include/c99/stdint.h | 2 -- src/egl/main/eglcompiler.h | 4 +--- src/mesa/main/compiler.h | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/c99/stdint.h b/include/c99/stdint.h index e3802135be..fc6459d03d 100644 --- 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 401a9cf56a..6ecee51d7c 100644 --- 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 efd8057608..e0507ccf86 100644 --- 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; -- cgit v1.2.3