[xiph-commits] r14167 - trunk/ogg2/include/ogg2

[ivo at svn.xiph.org]

Author: ivo
Date: 2007-11-16 05:49:07 -0800 (Fri, 16 Nov 2007)
New Revision: 14167

Modified:
   trunk/ogg2/include/ogg2/os_types.h
Log:
applied j's patch for mingw32 compatibility.  closes ticket #586

Modified: trunk/ogg2/include/ogg2/os_types.h
===================================================================
--- trunk/ogg2/include/ogg2/os_types.h	2007-11-16 13:32:09 UTC (rev 14166)
+++ trunk/ogg2/include/ogg2/os_types.h	2007-11-16 13:49:07 UTC (rev 14167)
@@ -24,7 +24,7 @@
 #define _ogg_realloc realloc
 #define _ogg_free    free
 
-#ifdef _WIN32 
+#if defined(_WIN32)
 
 #  ifndef __GNUC__
    /* MSVC/Borland */
@@ -33,6 +33,27 @@
    typedef unsigned __int32 ogg_uint32_t;
    typedef __int16 ogg_int16_t;
    typedef unsigned __int16 ogg_uint16_t;
+
+#  if defined(__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;
+   typedef _G_uint16_t ogg_uint16_t;
+#  elif defined(__MINGW32__)
+   typedef short ogg_int16_t;
+   typedef unsigned short ogg_uint16_t;
+   typedef int ogg_int32_t;
+   typedef unsigned int ogg_uint32_t;
+   typedef long long ogg_int64_t;
+   typedef unsigned long long ogg_uint64_t;
+#  elif defined(__MWERKS__)
+   typedef long long ogg_int64_t;
+   typedef int ogg_int32_t;
+   typedef unsigned int ogg_uint32_t;
+   typedef short ogg_int16_t;
+   typedef unsigned short ogg_uint16_t;
 #  else
    /* Cygwin */
    #include <_G_config.h>
@@ -41,6 +62,12 @@
    typedef _G_uint32_t ogg_uint32_t;
    typedef _G_int16_t ogg_int16_t;
    typedef _G_uint16_t ogg_uint16_t;
+   /* MSVC/Borland */
+   typedef __int64 ogg_int64_t;
+   typedef __int32 ogg_int32_t;
+   typedef unsigned __int32 ogg_uint32_t;
+   typedef __int16 ogg_int16_t;
+   typedef unsigned __int16 ogg_uint16_t;
 #  endif
 
 #elif defined(__MACOS__)
@@ -80,6 +107,31 @@
    typedef unsigned int ogg_uint32_t;
    typedef long long ogg_int64_t;
 
+#elif defined (DJGPP)
+
+   /* DJGPP */
+   typedef short ogg_int16_t;
+   typedef int ogg_int32_t;
+   typedef unsigned int ogg_uint32_t;
+   typedef long long ogg_int64_t;
+
+#elif defined(R5900)
+
+   /* PS2 EE */
+   typedef long ogg_int64_t;
+   typedef int ogg_int32_t;
+   typedef unsigned ogg_uint32_t;
+   typedef short ogg_int16_t;
+
+#elif defined(__SYMBIAN32__)
+
+   /* Symbian GCC */
+   typedef signed short ogg_int16_t;
+   typedef unsigned short ogg_uint16_t;
+   typedef signed int ogg_int32_t;
+   typedef unsigned int ogg_uint32_t;
+   typedef long long int ogg_int64_t;
+
 #else
 
 #  include <sys/types.h>