Better check which includes #define used in stdint.h

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403718
This commit is contained in:
Sam Lantinga 2009-08-02 12:54:59 +00:00
parent 72e444bb08
commit 51273d8424
7 changed files with 15 additions and 12 deletions

View file

@ -39,6 +39,7 @@
#undef volatile #undef volatile
/* C datatypes */ /* C datatypes */
#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
#undef size_t #undef size_t
#undef int8_t #undef int8_t
#undef uint8_t #undef uint8_t
@ -49,6 +50,8 @@
#undef int64_t #undef int64_t
#undef uint64_t #undef uint64_t
#undef uintptr_t #undef uintptr_t
#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
#undef SIZEOF_VOIDP #undef SIZEOF_VOIDP
#undef SDL_HAS_64BIT_TYPE #undef SDL_HAS_64BIT_TYPE

View file

@ -27,7 +27,7 @@
/* This is a set of defines to configure the SDL features */ /* This is a set of defines to configure the SDL features */
#ifndef HAVE_STDINT_H #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
typedef signed char int8_t; typedef signed char int8_t;
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
typedef signed short int16_t; typedef signed short int16_t;
@ -37,7 +37,7 @@ typedef unsigned int uint32_t;
typedef signed long long int64_t; typedef signed long long int64_t;
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
typedef unsigned long uintptr_t; typedef unsigned long uintptr_t;
#endif /* !HAVE_STDINT_H */ #endif /* !_STDINT_H_ && !HAVE_STDINT_H */
#define SIZEOF_VOIDP 4 #define SIZEOF_VOIDP 4
#define SDL_HAS_64BIT_TYPE 1 #define SDL_HAS_64BIT_TYPE 1

View file

@ -25,7 +25,7 @@
#include "SDL_platform.h" #include "SDL_platform.h"
#ifndef HAVE_STDINT_H #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
typedef signed char int8_t; typedef signed char int8_t;
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
typedef signed short int16_t; typedef signed short int16_t;
@ -33,7 +33,7 @@ typedef unsigned short uint16_t;
typedef signed int int32_t; typedef signed int int32_t;
typedef unsigned int uint32_t; typedef unsigned int uint32_t;
typedef unsigned long uintptr_t; typedef unsigned long uintptr_t;
#endif /* !HAVE_STDINT_H */ #endif /* !_STDINT_H_ && !HAVE_STDINT_H */
#define SDL_HAS_64BIT_TYPE 1 #define SDL_HAS_64BIT_TYPE 1

View file

@ -29,7 +29,7 @@
#include <stdarg.h> #include <stdarg.h>
#ifndef HAVE_STDINT_H #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
typedef signed char int8_t; typedef signed char int8_t;
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
typedef signed short int16_t; typedef signed short int16_t;
@ -38,7 +38,7 @@ typedef signed int int32_t;
typedef unsigned int uint32_t; typedef unsigned int uint32_t;
typedef unsigned int size_t; typedef unsigned int size_t;
typedef unsigned long uintptr_t; typedef unsigned long uintptr_t;
#endif /* !HAVE_STDINT_H */ #endif /* !_STDINT_H_ && !HAVE_STDINT_H */
/* Enable the dummy audio driver (src/audio/dummy/\*.c) */ /* Enable the dummy audio driver (src/audio/dummy/\*.c) */
#define SDL_AUDIO_DRIVER_DUMMY 1 #define SDL_AUDIO_DRIVER_DUMMY 1

View file

@ -27,7 +27,7 @@
/* This is a set of defines to configure the SDL features */ /* This is a set of defines to configure the SDL features */
#ifndef HAVE_STDINT_H #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
typedef signed char int8_t; typedef signed char int8_t;
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
typedef signed short int16_t; typedef signed short int16_t;
@ -44,7 +44,7 @@ typedef unsigned long uintptr_t;
#else #else
typedef unsigned __PTRDIFF_TYPE__ uintptr_t; typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
#endif #endif
#endif /* !HAVE_STDINT_H */ #endif /* !_STDINT_H_ && !HAVE_STDINT_H */
#define SDL_HAS_64BIT_TYPE 1 #define SDL_HAS_64BIT_TYPE 1

View file

@ -27,7 +27,7 @@
/* This is a set of defines to configure the SDL features */ /* This is a set of defines to configure the SDL features */
#ifndef HAVE_STDINT_H #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
typedef signed char int8_t; typedef signed char int8_t;
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
typedef signed short int16_t; typedef signed short int16_t;
@ -38,7 +38,7 @@ typedef unsigned int size_t;
typedef unsigned long uintptr_t; typedef unsigned long uintptr_t;
typedef signed long long int64_t; typedef signed long long int64_t;
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
#endif /* !HAVE_STDINT_H */ #endif /* !_STDINT_H_ && !HAVE_STDINT_H */
#define SIZEOF_VOIDP 4 #define SIZEOF_VOIDP 4
#define SDL_HAS_64BIT_TYPE 1 #define SDL_HAS_64BIT_TYPE 1

View file

@ -27,7 +27,7 @@
/* This is a set of defines to configure the SDL features */ /* This is a set of defines to configure the SDL features */
#ifndef HAVE_STDINT_H #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
#if defined(__GNUC__) || defined(__DMC__) #if defined(__GNUC__) || defined(__DMC__)
#define HAVE_STDINT_H 1 #define HAVE_STDINT_H 1
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
@ -69,7 +69,7 @@ typedef unsigned int size_t;
#endif #endif
typedef unsigned int uintptr_t; typedef unsigned int uintptr_t;
#endif /* __GNUC__ || _MSC_VER */ #endif /* __GNUC__ || _MSC_VER */
#endif /* !HAVE_STDINT_H */ #endif /* !_STDINT_H_ && !HAVE_STDINT_H */
#ifdef _WIN64 #ifdef _WIN64
# define SIZEOF_VOIDP 8 # define SIZEOF_VOIDP 8