diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-11-23 00:12:18 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@caiaq.de> | 2009-12-16 16:11:36 +0800 |
| commit | 17d34462eace417075efa2314999a77e41a3849b (patch) | |
| tree | 55bc1bbf154797026d7dcd42762b7b12eac16cf9 /src/pulsecore/rtpoll.c | |
| parent | 962164a3b7f17f8a981862d7913a420636241a41 (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/rtpoll.c')
| -rw-r--r-- | src/pulsecore/rtpoll.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c index 666cbc98..83993f02 100644 --- a/src/pulsecore/rtpoll.c +++ b/src/pulsecore/rtpoll.c @@ -30,15 +30,10 @@ #include <string.h> #include <errno.h> -#ifdef HAVE_POLL_H -#include <poll.h> -#else -#include <pulsecore/poll.h> -#endif - #include <pulse/xmalloc.h> #include <pulse/timeval.h> +#include <pulsecore/poll.h> #include <pulsecore/core-error.h> #include <pulsecore/core-rtclock.h> #include <pulsecore/macro.h> @@ -304,7 +299,7 @@ int pa_rtpoll_run(pa_rtpoll *p, pa_bool_t wait_op) { r = ppoll(p->pollfd, p->n_pollfd_used, (!wait_op || p->quit || p->timer_enabled) ? &ts : NULL, NULL); } #else - r = poll(p->pollfd, p->n_pollfd_used, (!wait_op || p->quit || p->timer_enabled) ? (int) ((timeout.tv_sec*1000) + (timeout.tv_usec / 1000)) : -1); + r = pa_poll(p->pollfd, p->n_pollfd_used, (!wait_op || p->quit || p->timer_enabled) ? (int) ((timeout.tv_sec*1000) + (timeout.tv_usec / 1000)) : -1); #endif p->timer_elapsed = r == 0; |