diff options
author | Lennart Poettering <lennart@poettering.net> | 2010-01-05 22:52:57 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2010-01-05 22:52:57 +0100 |
commit | 6dfb1ee27e031528891696c83230d4513c55b554 (patch) | |
tree | d17bcdf21366097589a024b6f46b33164f832448 /src/pulsecore/rtpoll.c | |
parent | 937c587e7720ee27b36fe736a2aa1cfd233270ec (diff) | |
parent | f452c6cdd9e5717340807478d759ef5a03b55f1f (diff) |
Merge remote branch 'zonque/topic/osx'
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 e2f82626..2ef78736 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> @@ -321,7 +316,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; |