diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-04 15:18:07 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-04 15:18:07 +0000 |
| commit | 74be305ceaa8efe67195549c03048e9931df4379 (patch) | |
| tree | ab51bc1744007319312d3499d7a30605ab141ac4 /tremor | |
| parent | 0d4021d340417883c0bfafc82247a1b688857237 (diff) | |
| download | mpv-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')
| -rw-r--r-- | tremor/config_types.h | 22 | ||||
| -rw-r--r-- | tremor/os_types.h | 47 |
2 files changed, 0 insertions, 69 deletions
diff --git a/tremor/config_types.h b/tremor/config_types.h deleted file mode 100644 index 1171ecd219..0000000000 --- a/tremor/config_types.h +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************** - * * - * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. * - * * - * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 * - * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ * - * ALL REDISTRIBUTION RIGHTS RESERVED. * - * * - ******************************************************************** - - function: #ifdef jail to whip a few platforms into the UNIX ideal. - - ********************************************************************/ -#ifndef _OS_CVTYPES_H -#define _OS_CVTYPES_H - -typedef long long ogg_int64_t; -typedef int ogg_int32_t; -typedef unsigned int ogg_uint32_t; -typedef short ogg_int16_t; - -#endif 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 */ |