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/pulse | |
| parent | 937c587e7720ee27b36fe736a2aa1cfd233270ec (diff) | |
| parent | f452c6cdd9e5717340807478d759ef5a03b55f1f (diff) | |
Merge remote branch 'zonque/topic/osx'
Diffstat (limited to 'src/pulse')
| -rw-r--r-- | src/pulse/mainloop.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c index 6cd089ef..8f743ec7 100644 --- a/src/pulse/mainloop.c +++ b/src/pulse/mainloop.c @@ -32,12 +32,6 @@ #include <fcntl.h> #include <errno.h> -#ifdef HAVE_POLL_H -#include <poll.h> -#else -#include <pulsecore/poll.h> -#endif - #ifndef HAVE_PIPE #include <pulsecore/pipe.h> #endif @@ -47,6 +41,7 @@ #include <pulse/timeval.h> #include <pulse/xmalloc.h> +#include <pulsecore/poll.h> #include <pulsecore/core-rtclock.h> #include <pulsecore/core-util.h> #include <pulsecore/llist.h> @@ -887,7 +882,7 @@ int pa_mainloop_poll(pa_mainloop *m) { m->prepared_timeout == PA_USEC_INVALID ? NULL : pa_timespec_store(&ts, m->prepared_timeout), NULL); #else - m->poll_func_ret = poll( + m->poll_func_ret = pa_poll( m->pollfds, m->n_pollfds, usec_to_timeout(m->prepared_timeout)); #endif |