diff options
author | Colin Guthrie <cguthrie@mandriva.org> | 2011-02-25 09:24:07 +0000 |
---|---|---|
committer | Colin Guthrie <cguthrie@mandriva.org> | 2011-02-25 09:24:07 +0000 |
commit | a3dbdb044656e2f3ab9c7ae54fe74b9669155f2d (patch) | |
tree | d033464ab41e36f04763235160f1024afa0438b7 /src/pulse/thread-mainloop.c | |
parent | f51889c6f64f11221caba3615bf779fc19d0dd15 (diff) | |
parent | 821562b9bc8d1a9033daaae0fd5373498a085054 (diff) |
Merge remote-tracking branch 'mkbosmans/mingw32-build'
Diffstat (limited to 'src/pulse/thread-mainloop.c')
-rw-r--r-- | src/pulse/thread-mainloop.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/pulse/thread-mainloop.c b/src/pulse/thread-mainloop.c index c3cf49c4..ef4ef56e 100644 --- a/src/pulse/thread-mainloop.c +++ b/src/pulse/thread-mainloop.c @@ -31,12 +31,6 @@ #include <signal.h> #include <stdio.h> -#ifdef HAVE_POLL_H -#include <poll.h> -#else -#include <pulsecore/poll.h> -#endif - #include <pulse/xmalloc.h> #include <pulse/mainloop.h> #include <pulse/i18n.h> @@ -46,6 +40,7 @@ #include <pulsecore/thread.h> #include <pulsecore/mutex.h> #include <pulsecore/macro.h> +#include <pulsecore/poll.h> #include "thread-mainloop.h" @@ -72,7 +67,7 @@ static int poll_func(struct pollfd *ufds, unsigned long nfds, int timeout, void * avahi_simple_poll_quit() can succeed from another thread. */ pa_mutex_unlock(mutex); - r = poll(ufds, nfds, timeout); + r = pa_poll(ufds, nfds, timeout); pa_mutex_lock(mutex); return r; |