Mercurial > sdl-ios-xcode
changeset 3219:b91354fa65a2
Don't redefine types if HAVE_STDINT_H is defined
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 02 Aug 2009 12:45:20 +0000 |
| parents | 81773a1eac83 |
| children | 6290f9bd097d |
| files | include/SDL_config_dreamcast.h include/SDL_config_iphoneos.h include/SDL_config_minimal.h include/SDL_config_nintendods.h include/SDL_config_os2.h include/SDL_config_win32.h |
| diffstat | 6 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/include/SDL_config_dreamcast.h Thu Jul 30 14:53:57 2009 +0000 +++ b/include/SDL_config_dreamcast.h Sun Aug 02 12:45:20 2009 +0000 @@ -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 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
--- a/include/SDL_config_iphoneos.h Thu Jul 30 14:53:57 2009 +0000 +++ b/include/SDL_config_iphoneos.h Sun Aug 02 12:45:20 2009 +0000 @@ -25,6 +25,7 @@ #include "SDL_platform.h" +#ifndef HAVE_STDINT_H typedef signed char int8_t; typedef unsigned char uint8_t; typedef signed short int16_t; @@ -32,6 +33,8 @@ 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
--- a/include/SDL_config_minimal.h Thu Jul 30 14:53:57 2009 +0000 +++ b/include/SDL_config_minimal.h Sun Aug 02 12:45:20 2009 +0000 @@ -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 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
--- a/include/SDL_config_nintendods.h Thu Jul 30 14:53:57 2009 +0000 +++ b/include/SDL_config_nintendods.h Sun Aug 02 12:45:20 2009 +0000 @@ -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 @@ #else typedef unsigned __PTRDIFF_TYPE__ uintptr_t; #endif - +#endif /* !HAVE_STDINT_H */ #define SDL_HAS_64BIT_TYPE 1
--- a/include/SDL_config_os2.h Thu Jul 30 14:53:57 2009 +0000 +++ b/include/SDL_config_os2.h Sun Aug 02 12:45:20 2009 +0000 @@ -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 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
--- a/include/SDL_config_win32.h Thu Jul 30 14:53:57 2009 +0000 +++ b/include/SDL_config_win32.h Sun Aug 02 12:45:20 2009 +0000 @@ -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 @@ #endif typedef unsigned int uintptr_t; #endif /* __GNUC__ || _MSC_VER */ +#endif /* !HAVE_STDINT_H */ #ifdef _WIN64 # define SIZEOF_VOIDP 8