Don't redefine types if HAVE_STDINT_H is defined

libsdl-org · Aug 2, 2009 · 1f8df27 · 1f8df27
1 parent 7d6f4ba
commit 1f8df27
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 1 deletion.
diff --git a/include/SDL_config_dreamcast.h b/include/SDL_config_dreamcast.h
@@ -27,6 +27,7 @@
 
 /* This is a set of defines to configure the SDL features */
 
+#ifndef HAVE_STDINT_H
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
 typedef signed short int16_t;
@@ -36,6 +37,8 @@ typedef unsigned int uint32_t;
 typedef signed long long int64_t;
 typedef unsigned long long uint64_t;
 typedef unsigned long uintptr_t;
+#endif /* !HAVE_STDINT_H */
+
 #define SIZEOF_VOIDP 4
 #define SDL_HAS_64BIT_TYPE	1
 

diff --git a/include/SDL_config_iphoneos.h b/include/SDL_config_iphoneos.h
@@ -25,13 +25,16 @@
 
 #include "SDL_platform.h"
 
+#ifndef HAVE_STDINT_H
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
 typedef signed short int16_t;
 typedef unsigned short uint16_t;
 typedef signed int int32_t;
 typedef unsigned int uint32_t;
 typedef unsigned long uintptr_t;
+#endif /* !HAVE_STDINT_H */
+
 #define SDL_HAS_64BIT_TYPE	1
 
 #define HAVE_ALLOCA_H		1

diff --git a/include/SDL_config_minimal.h b/include/SDL_config_minimal.h
@@ -29,6 +29,7 @@
 
 #include <stdarg.h>
 
+#ifndef HAVE_STDINT_H
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
 typedef signed short int16_t;
@@ -37,6 +38,7 @@ typedef signed int int32_t;
 typedef unsigned int uint32_t;
 typedef unsigned int size_t;
 typedef unsigned long uintptr_t;
+#endif /* !HAVE_STDINT_H */
 
 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */
 #define SDL_AUDIO_DRIVER_DUMMY	1

diff --git a/include/SDL_config_nintendods.h b/include/SDL_config_nintendods.h
@@ -27,6 +27,7 @@
 
 /* This is a set of defines to configure the SDL features */
 
+#ifndef HAVE_STDINT_H
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
 typedef signed short int16_t;
@@ -43,7 +44,7 @@ typedef unsigned long uintptr_t;
 #else
 typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
 #endif
-
+#endif /* !HAVE_STDINT_H */
 
 #define SDL_HAS_64BIT_TYPE	1
 

diff --git a/include/SDL_config_os2.h b/include/SDL_config_os2.h
@@ -27,6 +27,7 @@
 
 /* This is a set of defines to configure the SDL features */
 
+#ifndef HAVE_STDINT_H
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
 typedef signed short int16_t;
@@ -37,6 +38,7 @@ typedef unsigned int size_t;
 typedef unsigned long uintptr_t;
 typedef signed long long int64_t;
 typedef unsigned long long uint64_t;
+#endif /* !HAVE_STDINT_H */
 
 #define SIZEOF_VOIDP 4
 #define SDL_HAS_64BIT_TYPE	1

diff --git a/include/SDL_config_win32.h b/include/SDL_config_win32.h
@@ -27,6 +27,7 @@
 
 /* This is a set of defines to configure the SDL features */
 
+#ifndef HAVE_STDINT_H
 #if defined(__GNUC__) || defined(__DMC__)
 #define HAVE_STDINT_H	1
 #elif defined(_MSC_VER)
@@ -68,6 +69,7 @@ typedef unsigned int size_t;
 #endif
 typedef unsigned int uintptr_t;
 #endif /* __GNUC__ || _MSC_VER */
+#endif /* !HAVE_STDINT_H */
 
 #ifdef _WIN64
 # define SIZEOF_VOIDP 8