diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-27 13:09:40 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-27 13:09:40 +0000 |
commit | 60e30388e4a6b38cb4d49c0001dc7ff4680502e5 (patch) | |
tree | 34a784e5320884d73237b5f11ffcd59d22bd82cd /tremor/os_types.h | |
parent | cf96d139600e95e459b0a7cc60cd4be6c20fe15c (diff) | |
download | mpv-60e30388e4a6b38cb4d49c0001dc7ff4680502e5.tar.bz2 mpv-60e30388e4a6b38cb4d49c0001dc7ff4680502e5.tar.xz |
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
Diffstat (limited to 'tremor/os_types.h')
-rw-r--r-- | tremor/os_types.h | 57 |
1 files changed, 57 insertions, 0 deletions
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 <sys/types.h> + 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 <sys/types.h> + 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 <inttypes.h> + +#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 <sys/types.h> +# include "config_types.h" + +#endif + +#endif /* 0 */ + #endif /* _OS_TYPES_H */ |