From 295f14e94d16f44cf489260c38a561c971c7deca Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Sat, 3 Jun 2006 22:30:13 +0000 Subject: Use stdint types for the CYGWIN build instead of the ones from _G_config.h. This is reportedly more reliable in these modern times. Also, remove spurious whitespace from the MINGW32 typedefs. svn path=/trunk/ogg/; revision=11511 --- include/ogg/os_types.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/ogg/os_types.h b/include/ogg/os_types.h index e576080..a6aedeb 100644 --- a/include/ogg/os_types.h +++ b/include/ogg/os_types.h @@ -27,19 +27,20 @@ #if defined(_WIN32) # if defined(__CYGWIN__) -# include <_G_config.h> - typedef _G_int64_t ogg_int64_t; - typedef _G_int32_t ogg_int32_t; - typedef _G_uint32_t ogg_uint32_t; - typedef _G_int16_t ogg_int16_t; - typedef _G_uint16_t ogg_uint16_t; +# include + typedef int16_t ogg_int16_t; + typedef uint16_t ogg_uint16_t; + typedef int32_t ogg_int32_t; + typedef uint32_t ogg_uint32_t; + typedef int64_t ogg_int64_t; + typedef uint64_t ogg_uint64_t; # elif defined(__MINGW32__) - typedef short ogg_int16_t; - typedef unsigned short ogg_uint16_t; - typedef int ogg_int32_t; - typedef unsigned int ogg_uint32_t; - typedef long long ogg_int64_t; - typedef unsigned long long ogg_uint64_t; + typedef short ogg_int16_t; + typedef unsigned short ogg_uint16_t; + typedef int ogg_int32_t; + typedef unsigned int ogg_uint32_t; + typedef long long ogg_int64_t; + typedef unsigned long long ogg_uint64_t; # elif defined(__MWERKS__) typedef long long ogg_int64_t; typedef int ogg_int32_t; -- cgit v1.2.1