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/modules | |
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/modules')
-rw-r--r-- | src/modules/module-sine-source.c | 2 | ||||
-rw-r--r-- | src/modules/raop/module-raop-sink.c | 2 | ||||
-rw-r--r-- | src/modules/raop/raop_client.c | 5 | ||||
-rw-r--r-- | src/modules/rtp/rtsp_client.c | 5 |
4 files changed, 2 insertions, 12 deletions
diff --git a/src/modules/module-sine-source.c b/src/modules/module-sine-source.c index 9826e5f4..53f53353 100644 --- a/src/modules/module-sine-source.c +++ b/src/modules/module-sine-source.c @@ -32,7 +32,6 @@ #include <unistd.h> #include <limits.h> #include <sys/ioctl.h> -#include <sys/poll.h> #include <pulse/rtclock.h> #include <pulse/timeval.h> @@ -48,6 +47,7 @@ #include <pulsecore/thread.h> #include <pulsecore/thread-mq.h> #include <pulsecore/rtpoll.h> +#include <pulsecore/poll.h> #include "module-sine-source-symdef.h" diff --git a/src/modules/raop/module-raop-sink.c b/src/modules/raop/module-raop-sink.c index ac48ab10..ce534ce3 100644 --- a/src/modules/raop/module-raop-sink.c +++ b/src/modules/raop/module-raop-sink.c @@ -32,7 +32,6 @@ #include <fcntl.h> #include <unistd.h> #include <limits.h> -#include <poll.h> #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> @@ -60,6 +59,7 @@ #include <pulsecore/thread.h> #include <pulsecore/time-smoother.h> #include <pulsecore/socket-util.h> +#include <pulsecore/poll.h> #include "module-raop-sink-symdef.h" #include "rtp.h" diff --git a/src/modules/raop/raop_client.c b/src/modules/raop/raop_client.c index c4b02371..e3152dd3 100644 --- a/src/modules/raop/raop_client.c +++ b/src/modules/raop/raop_client.c @@ -51,12 +51,7 @@ #include <pulsecore/macro.h> #include <pulsecore/strbuf.h> #include <pulsecore/random.h> - -#ifdef HAVE_POLL_H -#include <poll.h> -#else #include <pulsecore/poll.h> -#endif #include "raop_client.h" #include "rtsp_client.h" diff --git a/src/modules/rtp/rtsp_client.c b/src/modules/rtp/rtsp_client.c index 59618064..6094eb82 100644 --- a/src/modules/rtp/rtsp_client.c +++ b/src/modules/rtp/rtsp_client.c @@ -45,12 +45,7 @@ #include <pulsecore/macro.h> #include <pulsecore/strbuf.h> #include <pulsecore/ioline.h> - -#ifdef HAVE_POLL_H -#include <poll.h> -#else #include <pulsecore/poll.h> -#endif #include "rtsp_client.h" |