[xiph-cvs] cvs commit: ogg/include/ogg os_types.h

[Monty]

xiphmont    01/06/02 20:09:18

  Modified:    include/ogg os_types.h
  Log:
  Brian was right; I missed this one.

Revision  Changes    Path
1.7       +36 -38    ogg/include/ogg/os_types.h

Index: os_types.h
===================================================================
RCS file: /usr/local/cvsroot/ogg/include/ogg/os_types.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- os_types.h	2001/02/26 03:49:58	1.6
+++ os_types.h	2001/06/03 03:09:18	1.7
@@ -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;
+
+#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;
 
-typedef SInt16 ogg_int16_t;
-typedef SInt32 ogg_int32_t;
-typedef UInt32 ogg_uint32_t;
-typedef SInt64 ogg_int64_t;
-
-#  else
-
-#    ifdef __BEOS__
-
-/* Be */
-#include <inttypes.h>
-
-#    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 */

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.