[vorbis-dev] [Patch] OS/2 port

[Brian Havard]

[Repost, maybe it will get noticed with a better subject]

So now beta 4 is out is there any chance you guys will have time to review 
some of my patches? Here's a simple one. It just adds the standard integer 
typedefs for EMX GCC. I've flattened the structure using #elif's so it doesn't 
get a level deeper for every platform added but the result should be the same. 
I realise doing so makes the patch harder to read but I couldn't bring myself 
to make this file even uglier :)

diff -x CVS -x fc.mnu -x *.diff -urN ../OggVorbis.clean/ogg/include/ogg/os_types.h ogg/include/ogg/os_types.h
--- ../OggVorbis.clean/ogg/include/ogg/os_types.h	Tue Feb 27 00:28:28 2001
+++ ogg/include/ogg/os_types.h	Tue Feb 27 00:29:50 2001
@@ -43,10 +43,7 @@
 typedef _G_int16_t ogg_int16_t;
 
 #  endif
-#else
-
-
-#  ifdef macintosh
+#elif defined(macintosh)
 
 #include <sys/types.h>
 
@@ -55,20 +52,24 @@
 typedef UInt32 ogg_uint32_t;
 typedef SInt64 ogg_int64_t;
 
-#  else
+#elif defined(__EMX__)
+
+typedef short ogg_int16_t;
+typedef int ogg_int32_t;
+typedef unsigned int ogg_uint32_t;
+typedef long long ogg_int64_t;
 
-#    ifdef __BEOS__
+#else
+
+#  ifdef __BEOS__
 
 /* Be */
 #include <inttypes.h>
 
-#    endif
+#  endif
 
 #include <sys/types.h>
 #include <ogg/config_types.h>
-
-#  endif /* macintosh */
-
-#endif  /* _WIN32 */
+#endif
 
 #endif  /* _OS_TYPES_H */


-- 
 ______________________________________________________________________________
 |  Brian Havard                 |  "He is not the messiah!                   |
 |  brianh at kheldar.apana.org.au  |  He's a very naughty boy!" - Life of Brian |
 ------------------------------------------------------------------------------

--- >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 'vorbis-dev-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.