From 4710d863e5b28220980869c2cb6e369ed40d196f Mon Sep 17 00:00:00 2001
From: Monty <xiphmont@xiph.org>
Date: Sun, 3 Jun 2001 03:09:18 +0000
Subject: Brian was right; I missed this one.

git-svn-id: http://svn.xiph.org/trunk/ogg@1470 0101bb08-14d6-0310-b084-bc0e0c8e3800
---
 include/ogg/os_types.h | 66 ++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

(limited to 'include')

diff --git a/include/ogg/os_types.h b/include/ogg/os_types.h
index bb14336..cbc0cd8 100644
--- a/include/ogg/os_types.h
+++ b/include/ogg/os_types.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os_types.h,v 1.6 2001/02/26 03:49:58 xiphmont Exp $
+ last mod: $Id: os_types.h,v 1.7 2001/06/03 03:09:18 xiphmont Exp $
 
  ********************************************************************/
 #ifndef _OS_TYPES_H
@@ -25,50 +25,48 @@
 #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;
 
+#  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;
-
+   /* 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
-#else
-
 
-#  ifdef macintosh
+#elif defined(macintosh)
 
-#include <sys/types.h>
+#  include <sys/types.h>
+   typedef SInt16 ogg_int16_t;
+   typedef SInt32 ogg_int32_t;
+   typedef UInt32 ogg_uint32_t;
+   typedef SInt64 ogg_int64_t;
 
-typedef SInt16 ogg_int16_t;
-typedef SInt32 ogg_int32_t;
-typedef UInt32 ogg_uint32_t;
-typedef SInt64 ogg_int64_t;
+#elif defined(__BEOS__)
 
-#  else
+   /* Be */
+#  include <inttypes.h>
 
-#    ifdef __BEOS__
+#elif defined (__EMX__)
 
-/* Be */
-#include <inttypes.h>
+   /* 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;
 
-#    endif
-
-#include <sys/types.h>
-#include <ogg/config_types.h>
+#else
 
-#  endif /* macintosh */
+#  include <sys/types.h>
+#  include <ogg/config_types.h>
 
-#endif  /* _WIN32 */
+#endif
 
 #endif  /* _OS_TYPES_H */
-- 
cgit v1.2.1