From 60e30388e4a6b38cb4d49c0001dc7ff4680502e5 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 13:09:40 +0000 Subject: Instead of removing code from this imported library, place it under #if 0. This makes the differences to upstream smaller and the diff more readable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26899 b3059339-0415-0410-9bf9-f77b7e298cf2 --- tremor/os_types.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'tremor/os_types.h') diff --git a/tremor/os_types.h b/tremor/os_types.h index 560ec8ff7d..6165e17dcf 100644 --- a/tremor/os_types.h +++ b/tremor/os_types.h @@ -39,4 +39,61 @@ typedef int16_t ogg_int16_t; typedef uint32_t ogg_uint32_t; typedef uint16_t ogg_uint16_t; +#if 0 + +#ifdef _WIN32 + +# ifndef __GNUC__ + /* MSVC/Borland */ + typedef __int64 ogg_int64_t; + typedef __int32 ogg_int32_t; + typedef unsigned __int32 ogg_uint32_t; + typedef __int16 ogg_int16_t; +# else + /* 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; +# endif + +#elif defined(__MACOS__) + +# include + typedef SInt16 ogg_int16_t; + typedef SInt32 ogg_int32_t; + typedef UInt32 ogg_uint32_t; + typedef SInt64 ogg_int64_t; + +#elif defined(__MACOSX__) /* MacOS X Framework build */ + +# include + typedef int16_t ogg_int16_t; + typedef int32_t ogg_int32_t; + typedef u_int32_t ogg_uint32_t; + typedef int64_t ogg_int64_t; + +#elif defined(__BEOS__) + + /* Be */ +# include + +#elif defined (__EMX__) + + /* OS/2 GCC */ + typedef short ogg_int16_t; + typedef int ogg_int32_t; + typedef unsigned int ogg_uint32_t; + typedef long long ogg_int64_t; + +#else + +# include +# include "config_types.h" + +#endif + +#endif /* 0 */ + #endif /* _OS_TYPES_H */ -- cgit v1.2.3