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/modules/raop | |
| parent | 937c587e7720ee27b36fe736a2aa1cfd233270ec (diff) | |
| parent | f452c6cdd9e5717340807478d759ef5a03b55f1f (diff) | |
Merge remote branch 'zonque/topic/osx'
Diffstat (limited to 'src/modules/raop')
| -rw-r--r-- | src/modules/raop/module-raop-sink.c | 2 | ||||
| -rw-r--r-- | src/modules/raop/raop_client.c | 5 |
2 files changed, 1 insertions, 6 deletions
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" |