Better check which includes #define used in stdint.h
authorSam Lantinga <slouken@libsdl.org>
Sun, 02 Aug 2009 12:54:59 +0000
changeset 32206290f9bd097d
parent 3219 b91354fa65a2
child 3221 7fd1dcc78ed7
Better check which includes #define used in stdint.h
include/SDL_config.h.in
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.h.in	Sun Aug 02 12:45:20 2009 +0000
     1.2 +++ b/include/SDL_config.h.in	Sun Aug 02 12:54:59 2009 +0000
     1.3 @@ -39,6 +39,7 @@
     1.4  #undef volatile
     1.5  
     1.6  /* C datatypes */
     1.7 +#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
     1.8  #undef size_t
     1.9  #undef int8_t
    1.10  #undef uint8_t
    1.11 @@ -49,6 +50,8 @@
    1.12  #undef int64_t
    1.13  #undef uint64_t
    1.14  #undef uintptr_t
    1.15 +#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
    1.16 +
    1.17  #undef SIZEOF_VOIDP
    1.18  #undef SDL_HAS_64BIT_TYPE
    1.19  
     2.1 --- a/include/SDL_config_dreamcast.h	Sun Aug 02 12:45:20 2009 +0000
     2.2 +++ b/include/SDL_config_dreamcast.h	Sun Aug 02 12:54:59 2009 +0000
     2.3 @@ -27,7 +27,7 @@
     2.4  
     2.5  /* This is a set of defines to configure the SDL features */
     2.6  
     2.7 -#ifndef HAVE_STDINT_H
     2.8 +#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
     2.9  typedef signed char int8_t;
    2.10  typedef unsigned char uint8_t;
    2.11  typedef signed short int16_t;
    2.12 @@ -37,7 +37,7 @@
    2.13  typedef signed long long int64_t;
    2.14  typedef unsigned long long uint64_t;
    2.15  typedef unsigned long uintptr_t;
    2.16 -#endif /* !HAVE_STDINT_H */
    2.17 +#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
    2.18  
    2.19  #define SIZEOF_VOIDP 4
    2.20  #define SDL_HAS_64BIT_TYPE	1
     3.1 --- a/include/SDL_config_iphoneos.h	Sun Aug 02 12:45:20 2009 +0000
     3.2 +++ b/include/SDL_config_iphoneos.h	Sun Aug 02 12:54:59 2009 +0000
     3.3 @@ -25,7 +25,7 @@
     3.4  
     3.5  #include "SDL_platform.h"
     3.6  
     3.7 -#ifndef HAVE_STDINT_H
     3.8 +#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
     3.9  typedef signed char int8_t;
    3.10  typedef unsigned char uint8_t;
    3.11  typedef signed short int16_t;
    3.12 @@ -33,7 +33,7 @@
    3.13  typedef signed int int32_t;
    3.14  typedef unsigned int uint32_t;
    3.15  typedef unsigned long uintptr_t;
    3.16 -#endif /* !HAVE_STDINT_H */
    3.17 +#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
    3.18  
    3.19  #define SDL_HAS_64BIT_TYPE	1
    3.20  
     4.1 --- a/include/SDL_config_minimal.h	Sun Aug 02 12:45:20 2009 +0000
     4.2 +++ b/include/SDL_config_minimal.h	Sun Aug 02 12:54:59 2009 +0000
     4.3 @@ -29,7 +29,7 @@
     4.4  
     4.5  #include <stdarg.h>
     4.6  
     4.7 -#ifndef HAVE_STDINT_H
     4.8 +#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
     4.9  typedef signed char int8_t;
    4.10  typedef unsigned char uint8_t;
    4.11  typedef signed short int16_t;
    4.12 @@ -38,7 +38,7 @@
    4.13  typedef unsigned int uint32_t;
    4.14  typedef unsigned int size_t;
    4.15  typedef unsigned long uintptr_t;
    4.16 -#endif /* !HAVE_STDINT_H */
    4.17 +#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
    4.18  
    4.19  /* Enable the dummy audio driver (src/audio/dummy/\*.c) */
    4.20  #define SDL_AUDIO_DRIVER_DUMMY	1
     5.1 --- a/include/SDL_config_nintendods.h	Sun Aug 02 12:45:20 2009 +0000
     5.2 +++ b/include/SDL_config_nintendods.h	Sun Aug 02 12:54:59 2009 +0000
     5.3 @@ -27,7 +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 +#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
     5.9  typedef signed char int8_t;
    5.10  typedef unsigned char uint8_t;
    5.11  typedef signed short int16_t;
    5.12 @@ -44,7 +44,7 @@
    5.13  #else
    5.14  typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
    5.15  #endif
    5.16 -#endif /* !HAVE_STDINT_H */
    5.17 +#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
    5.18  
    5.19  #define SDL_HAS_64BIT_TYPE	1
    5.20  
     6.1 --- a/include/SDL_config_os2.h	Sun Aug 02 12:45:20 2009 +0000
     6.2 +++ b/include/SDL_config_os2.h	Sun Aug 02 12:54:59 2009 +0000
     6.3 @@ -27,7 +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(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
     6.9  typedef signed char int8_t;
    6.10  typedef unsigned char uint8_t;
    6.11  typedef signed short int16_t;
    6.12 @@ -38,7 +38,7 @@
    6.13  typedef unsigned long uintptr_t;
    6.14  typedef signed long long int64_t;
    6.15  typedef unsigned long long uint64_t;
    6.16 -#endif /* !HAVE_STDINT_H */
    6.17 +#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
    6.18  
    6.19  #define SIZEOF_VOIDP 4
    6.20  #define SDL_HAS_64BIT_TYPE	1
     7.1 --- a/include/SDL_config_win32.h	Sun Aug 02 12:45:20 2009 +0000
     7.2 +++ b/include/SDL_config_win32.h	Sun Aug 02 12:54:59 2009 +0000
     7.3 @@ -27,7 +27,7 @@
     7.4  
     7.5  /* This is a set of defines to configure the SDL features */
     7.6  
     7.7 -#ifndef HAVE_STDINT_H
     7.8 +#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
     7.9  #if defined(__GNUC__) || defined(__DMC__)
    7.10  #define HAVE_STDINT_H	1
    7.11  #elif defined(_MSC_VER)
    7.12 @@ -69,7 +69,7 @@
    7.13  #endif
    7.14  typedef unsigned int uintptr_t;
    7.15  #endif /* __GNUC__ || _MSC_VER */
    7.16 -#endif /* !HAVE_STDINT_H */
    7.17 +#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
    7.18  
    7.19  #ifdef _WIN64
    7.20  # define SIZEOF_VOIDP 8