[MPlayer-cvslog] CVS: main/tremor os_types.h, 1.2, 1.3 config_types.h, 1.1, NONE

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/tremor
In directory mail:/var2/tmp/cvs-serv5904

Modified Files:
	os_types.h 
Removed Files:
	config_types.h 
Log Message:
fix/simplify os_types.h. MPlayer needs inttypes.h anyway to compile.


Index: os_types.h
===================================================================
RCS file: /cvsroot/mplayer/main/tremor/os_types.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- os_types.h	2 Jan 2005 15:47:48 -0000	1.2
+++ os_types.h	4 Jan 2005 15:18:07 -0000	1.3
@@ -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 */

--- config_types.h DELETED ---