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/utils/pacmd.c | |
parent | 937c587e7720ee27b36fe736a2aa1cfd233270ec (diff) | |
parent | f452c6cdd9e5717340807478d759ef5a03b55f1f (diff) |
Merge remote branch 'zonque/topic/osx'
Diffstat (limited to 'src/utils/pacmd.c')
-rw-r--r-- | src/utils/pacmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c index ef58e9ce..6ffe94fe 100644 --- a/src/utils/pacmd.c +++ b/src/utils/pacmd.c @@ -25,7 +25,6 @@ #include <assert.h> #include <signal.h> -#include <sys/poll.h> #include <sys/socket.h> #include <unistd.h> #include <errno.h> @@ -38,6 +37,7 @@ #include <pulse/xmalloc.h> #include <pulse/i18n.h> +#include <pulsecore/poll.h> #include <pulsecore/macro.h> #include <pulsecore/core-util.h> #include <pulsecore/log.h> @@ -153,7 +153,7 @@ int main(int argc, char*argv[]) { else if (!ibuf_eof) pollfd[WATCH_STDIN].events |= POLLIN; - if (poll(pollfd, N_WATCH, -1) < 0) { + if (pa_poll(pollfd, N_WATCH, -1) < 0) { if (errno == EINTR) continue; |