diff options
-rw-r--r-- | configure.in | 14 | ||||
-rw-r--r-- | include/ogg/os_types.h | 10 |
2 files changed, 17 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 33f19b9..19561a6 100644 --- a/configure.in +++ b/configure.in @@ -84,7 +84,7 @@ dnl Check for types 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_RESULT($has_int16_t) 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_RESULT($has_int32_t) 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_RESULT($has_uint32_t) 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_RESULT($has_uint16_t) 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_RESULT($has_u_int32_t) 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_RESULT($has_u_int16_t) 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> diff --git a/include/ogg/os_types.h b/include/ogg/os_types.h index 2f52c2f..906cf32 100644 --- a/include/ogg/os_types.h +++ b/include/ogg/os_types.h @@ -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 */ |