[xiph-commits] r14997 - in trunk/ogg: . include/ogg

[ivo at svn.xiph.org]

Author: ivo
Date: 2008-06-03 20:27:18 -0700 (Tue, 03 Jun 2008)
New Revision: 14997

Modified:
   trunk/ogg/configure.in
   trunk/ogg/include/ogg/os_types.h
Log:
Build support for Haiku.  Patch by scottmc at gmail.  Closes #1371.

Modified: trunk/ogg/configure.in
===================================================================
--- trunk/ogg/configure.in	2008-06-03 17:05:12 UTC (rev 14996)
+++ trunk/ogg/configure.in	2008-06-04 03:27:18 UTC (rev 14997)
@@ -84,7 +84,7 @@
 AC_MSG_CHECKING(for int16_t)
 AC_CACHE_VAL(has_int16_t,
 [AC_TRY_RUN([
-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
 #include <inttypes.h>
 #endif
 #include <sys/types.h>
@@ -100,7 +100,7 @@
 AC_MSG_CHECKING(for int32_t)
 AC_CACHE_VAL(has_int32_t,
 [AC_TRY_RUN([
-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
 #include <inttypes.h>
 #endif
 #include <sys/types.h>
@@ -116,7 +116,7 @@
 AC_MSG_CHECKING(for uint32_t)
 AC_CACHE_VAL(has_uint32_t,
 [AC_TRY_RUN([
-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
 #include <inttypes.h>
 #endif
 #include <sys/types.h>
@@ -132,7 +132,7 @@
 AC_MSG_CHECKING(for uint16_t)
 AC_CACHE_VAL(has_uint16_t,
 [AC_TRY_RUN([
-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
 #include <inttypes.h>
 #endif
 #include <sys/types.h>
@@ -148,7 +148,7 @@
 AC_MSG_CHECKING(for u_int32_t)
 AC_CACHE_VAL(has_u_int32_t,
 [AC_TRY_RUN([
-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
 #include <inttypes.h>
 #endif
 #include <sys/types.h>
@@ -164,7 +164,7 @@
 AC_MSG_CHECKING(for u_int16_t)
 AC_CACHE_VAL(has_u_int16_t,
 [AC_TRY_RUN([
-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
 #include <inttypes.h>
 #endif
 #include <sys/types.h>
@@ -180,7 +180,7 @@
 AC_MSG_CHECKING(for int64_t)
 AC_CACHE_VAL(has_int64_t,
 [AC_TRY_RUN([
-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
 #include <inttypes.h>
 #endif
 #include <sys/types.h>

Modified: trunk/ogg/include/ogg/os_types.h
===================================================================
--- trunk/ogg/include/ogg/os_types.h	2008-06-03 17:05:12 UTC (rev 14996)
+++ trunk/ogg/include/ogg/os_types.h	2008-06-04 03:27:18 UTC (rev 14997)
@@ -75,6 +75,16 @@
    typedef u_int32_t ogg_uint32_t;
    typedef int64_t ogg_int64_t;
 
+#elif defined(__HAIKU__)
+
+  /* Haiku */
+#  include <sys/types.h>
+   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;
+
 #elif defined(__BEOS__)
 
    /* Be */