path: root/src/pulsecore/poll.h
diff options
authorDaniel Mack <>2009-11-23 00:12:18 +0100
committerDaniel Mack <>2009-12-16 16:11:36 +0800
commit17d34462eace417075efa2314999a77e41a3849b (patch)
tree55bc1bbf154797026d7dcd42762b7b12eac16cf9 /src/pulsecore/poll.h
parent962164a3b7f17f8a981862d7913a420636241a41 (diff)
poll() is totally broken on Mac OS X
Even on 10.5.8, poll() does not do the right thing. Haven't checked on newer versions. Hence, wrap all occurences of poll() to pa_poll and emulate that call with select() on OSX. This is totally embarassing.
Diffstat (limited to 'src/pulsecore/poll.h')
1 files changed, 13 insertions, 5 deletions
diff --git a/src/pulsecore/poll.h b/src/pulsecore/poll.h
index fe0c6af6..a137d974 100644
--- a/src/pulsecore/poll.h
+++ b/src/pulsecore/poll.h
@@ -24,6 +24,10 @@
Copyright (C) 1994,96,97,98,99,2000,2001,2004 Free Software Foundation, Inc.
+#if defined(HAVE_POLL_H)
+#include <poll.h>
/* Event types that can be polled for. These bits may be set in `events'
to indicate the interesting event types; they will appear in `revents'
to indicate the status of the file descriptor. */
@@ -38,10 +42,6 @@
#define POLLHUP 0x010 /* Hung up. */
#define POLLNVAL 0x020 /* Invalid polling request. */
-/* Type used for the number of file descriptors. */
-typedef unsigned long int nfds_t;
/* Data structure describing a polling request. */
struct pollfd
@@ -50,9 +50,17 @@ struct pollfd
short int revents; /* Types of events that actually occurred. */
/* Poll the file descriptors described by the NFDS structures starting at
FDS. If TIMEOUT is nonzero and not -1, allow TIMEOUT milliseconds for
an event to occur; if TIMEOUT is -1, block until an event occurs.
Returns the number of file descriptors with events, zero if timed out,
or -1 for errors. */
-extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout);
+#endif /* HAVE_POLL_H */
+#if defined(HAVE_POLL_H) && !defined(OS_IS_DARWIN)
+#define pa_poll(fds,nfds,timeout) poll((fds),(nfds),(timeout))
+int pa_poll (struct pollfd *fds, unsigned long nfds, int timeout);