pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't redefine types if HAVE_STDINT_H is defined

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403717
This commit is contained in:
Sam Lantinga 2009-08-02 12:45:20 +00:00
parent 8a68fef797
commit 72e444bb08
6 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/SDL_config_dreamcast.h
View file

@ -27,6 +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
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;
@ -36,6 +37,8 @@ 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 */
#define SIZEOF_VOIDP 4 #define SIZEOF_VOIDP 4
#define SDL_HAS_64BIT_TYPE 1 #define SDL_HAS_64BIT_TYPE 1

3
include/SDL_config_iphoneos.h
View file

@ -25,6 +25,7 @@
#include "SDL_platform.h" #include "SDL_platform.h"
#ifndef 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;
@ -32,6 +33,8 @@ 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 */
#define SDL_HAS_64BIT_TYPE 1 #define SDL_HAS_64BIT_TYPE 1
#define HAVE_ALLOCA_H 1 #define HAVE_ALLOCA_H 1

2
include/SDL_config_minimal.h
View file

@ -29,6 +29,7 @@
#include <stdarg.h> #include <stdarg.h>
#ifndef 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,6 +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 */
/* 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

3
include/SDL_config_nintendods.h
View file

@ -27,6 +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
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;
@ -43,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 */
#define SDL_HAS_64BIT_TYPE 1 #define SDL_HAS_64BIT_TYPE 1

2
include/SDL_config_os2.h
View file

@ -27,6 +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
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,6 +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 */
#define SIZEOF_VOIDP 4 #define SIZEOF_VOIDP 4
#define SDL_HAS_64BIT_TYPE 1 #define SDL_HAS_64BIT_TYPE 1

2
include/SDL_config_win32.h
View file

@ -27,6 +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(__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)
@ -68,6 +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 */
#ifdef _WIN64 #ifdef _WIN64
# define SIZEOF_VOIDP 8 # define SIZEOF_VOIDP 8