# HG changeset patch # User Sam Lantinga # Date 1151255820 0 # Node ID 2047ec9bb665b3ee9a776dc79c09cb892e0c75a2 # Parent cd14138a8703501b541a10079bddb60042b40bf0 Merged gcc on win32 fix from SDL 1.2 diff -r cd14138a8703 -r 2047ec9bb665 include/SDL_config_win32.h --- a/include/SDL_config_win32.h Sat Jun 24 17:31:46 2006 +0000 +++ b/include/SDL_config_win32.h Sun Jun 25 17:17:00 2006 +0000 @@ -27,7 +27,9 @@ /* This is a set of defines to configure the SDL features */ -#ifdef _MSC_VER +#ifdef __GNUC__ +#define HAVE_STDINT_H 1 +#elif defined(_MSC_VER) typedef signed __int8 int8_t; typedef unsigned __int8 uint8_t; typedef signed __int16 int16_t; @@ -44,7 +46,7 @@ #endif #define _UINTPTR_T_DEFINED #endif -#else +#else /* !__GNUC__ && !_MSC_VER */ typedef signed char int8_t; typedef unsigned char uint8_t; typedef signed short int16_t; @@ -58,7 +60,7 @@ typedef unsigned int size_t; #endif typedef unsigned int uintptr_t; -#endif /* _MSC_VER */ +#endif /* __GNUC__ || _MSC_VER */ #define SDL_HAS_64BIT_TYPE 1 /* Enabled for SDL 1.2 (binary compatibility) */