From ddc553326e722be5de15d754997847194a5825e9 Mon Sep 17 00:00:00 2001 From: Grzegorz Dąbrowski Date: Mon, 13 Jul 2009 13:53:38 -0400 Subject: Bug 19446 - HaikuOS support Signed-off-by: Colin Walters (cherry picked from commit 97c58ace430fb58cedfc1e5c83db9759063b6946) --- configure.in | 2 +- dbus/dbus-sysdeps.h | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index f02089ed..5d423a15 100644 --- a/configure.in +++ b/configure.in @@ -386,7 +386,7 @@ AC_DEFINE_UNQUOTED(DBUS_HAVE_ATOMIC_INT_COND, [$have_atomic_inc_cond], [Always defined; expands to 1 if we have an atomic integer implementation, else 0]) #### Various functions -AC_CHECK_LIB(socket,socket) +AC_SEARCH_LIBS(socket,[socket network]) AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll) diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index 8ce6566d..30e7dff2 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -238,6 +238,19 @@ dbus_int32_t _dbus_atomic_dec (DBusAtomic *atomic); #define _DBUS_POLLHUP 0x2000 /** Invalid request: fd not open */ #define _DBUS_POLLNVAL 0x8000 +#elif defined(__HAIKU__) +/** There is data to read */ +#define _DBUS_POLLIN 0x0001 +/** Writing now will not block */ +#define _DBUS_POLLOUT 0x0002 +/** Error condition */ +#define _DBUS_POLLERR 0x0004 +/** There is urgent data to read */ +#define _DBUS_POLLPRI 0x0020 +/** Hung up */ +#define _DBUS_POLLHUP 0x0080 +/** Invalid request: fd not open */ +#define _DBUS_POLLNVAL 0x1000 #else /** There is data to read */ #define _DBUS_POLLIN 0x0001 -- cgit