2008-01-15 John (J5) Palmieri <johnp@redhat.com>
+ * patch by Peter O'Gorman <pogma at thewrittenword dot com>
+
+ * dbus/dbus-sysdeps.h: support for AIX poll implementation (FDO Bug
+ #11666)
+
+2008-01-15 John (J5) Palmieri <johnp@redhat.com>
+
* tests/name-test/run-test.sh: make more portable (FDO Bug #11667)
2008-01-15 John (J5) Palmieri <johnp@redhat.com>
#include <string.h>
#include <stdarg.h>
+
+/* AIX sys/poll.h does #define events reqevents, and other
+ * wonderousness, so must include sys/poll before declaring
+ * DBusPollFD
+ */
+#ifdef HAVE_POLL
+#include <sys/poll.h>
+#endif
+
DBUS_BEGIN_DECLS
#ifdef DBUS_WIN
dbus_int32_t _dbus_atomic_inc (DBusAtomic *atomic);
dbus_int32_t _dbus_atomic_dec (DBusAtomic *atomic);
+
+/* AIX uses different values for poll */
+
+#ifdef _AIX
+/** There is data to read */
+#define _DBUS_POLLIN 0x0001
+/** There is urgent data to read */
+#define _DBUS_POLLPRI 0x0004
+/** Writing now will not block */
+#define _DBUS_POLLOUT 0x0002
+/** Error condition */
+#define _DBUS_POLLERR 0x4000
+/** Hung up */
+#define _DBUS_POLLHUP 0x2000
+/** Invalid request: fd not open */
+#define _DBUS_POLLNVAL 0x8000
+#else
/** There is data to read */
#define _DBUS_POLLIN 0x0001
/** There is urgent data to read */
#define _DBUS_POLLHUP 0x0010
/** Invalid request: fd not open */
#define _DBUS_POLLNVAL 0x0020
+#endif
/**
* A portable struct pollfd wrapper.