summaryrefslogtreecommitdiffstats
path: root/tremor/os_types.h
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-01-04 15:18:07 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-01-04 15:18:07 +0000
commit74be305ceaa8efe67195549c03048e9931df4379 (patch)
treeab51bc1744007319312d3499d7a30605ab141ac4 /tremor/os_types.h
parent0d4021d340417883c0bfafc82247a1b688857237 (diff)
downloadmpv-74be305ceaa8efe67195549c03048e9931df4379.tar.bz2
mpv-74be305ceaa8efe67195549c03048e9931df4379.tar.xz
fix/simplify os_types.h. MPlayer needs inttypes.h anyway to compile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14354 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'tremor/os_types.h')
-rw-r--r--tremor/os_types.h47
1 files changed, 0 insertions, 47 deletions
diff --git a/tremor/os_types.h b/tremor/os_types.h
index 8e00506408..a2c3ccc7c3 100644
--- a/tremor/os_types.h
+++ b/tremor/os_types.h
@@ -32,57 +32,10 @@
#define _ogg_realloc realloc
#define _ogg_free free
-#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/MinGW */
#include <inttypes.h>
typedef int64_t ogg_int64_t;
typedef int32_t ogg_int32_t;
typedef uint32_t ogg_uint32_t;
typedef 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 /* _OS_TYPES_H */