Don't redefine types if HAVE_STDINT_H is defined
authorSam Lantinga <slouken@libsdl.org>
Sun, 02 Aug 2009 12:45:20 +0000
changeset 3219b91354fa65a2
parent 3218 81773a1eac83
child 3220 6290f9bd097d
Don't redefine types if HAVE_STDINT_H is defined
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
     1.1 --- a/include/SDL_config_dreamcast.h	Thu Jul 30 14:53:57 2009 +0000
     1.2 +++ b/include/SDL_config_dreamcast.h	Sun Aug 02 12:45:20 2009 +0000
     1.3 @@ -27,6 +27,7 @@
     1.4  
     1.5  /* This is a set of defines to configure the SDL features */
     1.6  
     1.7 +#ifndef HAVE_STDINT_H
     1.8  typedef signed char int8_t;
     1.9  typedef unsigned char uint8_t;
    1.10  typedef signed short int16_t;
    1.11 @@ -36,6 +37,8 @@
    1.12  typedef signed long long int64_t;
    1.13  typedef unsigned long long uint64_t;
    1.14  typedef unsigned long uintptr_t;
    1.15 +#endif /* !HAVE_STDINT_H */
    1.16 +
    1.17  #define SIZEOF_VOIDP 4
    1.18  #define SDL_HAS_64BIT_TYPE	1
    1.19  
     2.1 --- a/include/SDL_config_iphoneos.h	Thu Jul 30 14:53:57 2009 +0000
     2.2 +++ b/include/SDL_config_iphoneos.h	Sun Aug 02 12:45:20 2009 +0000
     2.3 @@ -25,6 +25,7 @@
     2.4  
     2.5  #include "SDL_platform.h"
     2.6  
     2.7 +#ifndef HAVE_STDINT_H
     2.8  typedef signed char int8_t;
     2.9  typedef unsigned char uint8_t;
    2.10  typedef signed short int16_t;
    2.11 @@ -32,6 +33,8 @@
    2.12  typedef signed int int32_t;
    2.13  typedef unsigned int uint32_t;
    2.14  typedef unsigned long uintptr_t;
    2.15 +#endif /* !HAVE_STDINT_H */
    2.16 +
    2.17  #define SDL_HAS_64BIT_TYPE	1
    2.18  
    2.19  #define HAVE_ALLOCA_H		1
     3.1 --- a/include/SDL_config_minimal.h	Thu Jul 30 14:53:57 2009 +0000
     3.2 +++ b/include/SDL_config_minimal.h	Sun Aug 02 12:45:20 2009 +0000
     3.3 @@ -29,6 +29,7 @@
     3.4  
     3.5  #include <stdarg.h>
     3.6  
     3.7 +#ifndef HAVE_STDINT_H
     3.8  typedef signed char int8_t;
     3.9  typedef unsigned char uint8_t;
    3.10  typedef signed short int16_t;
    3.11 @@ -37,6 +38,7 @@
    3.12  typedef unsigned int uint32_t;
    3.13  typedef unsigned int size_t;
    3.14  typedef unsigned long uintptr_t;
    3.15 +#endif /* !HAVE_STDINT_H */
    3.16  
    3.17  /* Enable the dummy audio driver (src/audio/dummy/\*.c) */
    3.18  #define SDL_AUDIO_DRIVER_DUMMY	1
     4.1 --- a/include/SDL_config_nintendods.h	Thu Jul 30 14:53:57 2009 +0000
     4.2 +++ b/include/SDL_config_nintendods.h	Sun Aug 02 12:45:20 2009 +0000
     4.3 @@ -27,6 +27,7 @@
     4.4  
     4.5  /* This is a set of defines to configure the SDL features */
     4.6  
     4.7 +#ifndef HAVE_STDINT_H
     4.8  typedef signed char int8_t;
     4.9  typedef unsigned char uint8_t;
    4.10  typedef signed short int16_t;
    4.11 @@ -43,7 +44,7 @@
    4.12  #else
    4.13  typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
    4.14  #endif
    4.15 -
    4.16 +#endif /* !HAVE_STDINT_H */
    4.17  
    4.18  #define SDL_HAS_64BIT_TYPE	1
    4.19  
     5.1 --- a/include/SDL_config_os2.h	Thu Jul 30 14:53:57 2009 +0000
     5.2 +++ b/include/SDL_config_os2.h	Sun Aug 02 12:45:20 2009 +0000
     5.3 @@ -27,6 +27,7 @@
     5.4  
     5.5  /* This is a set of defines to configure the SDL features */
     5.6  
     5.7 +#ifndef HAVE_STDINT_H
     5.8  typedef signed char int8_t;
     5.9  typedef unsigned char uint8_t;
    5.10  typedef signed short int16_t;
    5.11 @@ -37,6 +38,7 @@
    5.12  typedef unsigned long uintptr_t;
    5.13  typedef signed long long int64_t;
    5.14  typedef unsigned long long uint64_t;
    5.15 +#endif /* !HAVE_STDINT_H */
    5.16  
    5.17  #define SIZEOF_VOIDP 4
    5.18  #define SDL_HAS_64BIT_TYPE	1
     6.1 --- a/include/SDL_config_win32.h	Thu Jul 30 14:53:57 2009 +0000
     6.2 +++ b/include/SDL_config_win32.h	Sun Aug 02 12:45:20 2009 +0000
     6.3 @@ -27,6 +27,7 @@
     6.4  
     6.5  /* This is a set of defines to configure the SDL features */
     6.6  
     6.7 +#ifndef HAVE_STDINT_H
     6.8  #if defined(__GNUC__) || defined(__DMC__)
     6.9  #define HAVE_STDINT_H	1
    6.10  #elif defined(_MSC_VER)
    6.11 @@ -68,6 +69,7 @@
    6.12  #endif
    6.13  typedef unsigned int uintptr_t;
    6.14  #endif /* __GNUC__ || _MSC_VER */
    6.15 +#endif /* !HAVE_STDINT_H */
    6.16  
    6.17  #ifdef _WIN64
    6.18  # define SIZEOF_VOIDP 8