mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'zonque/topic/osx'

Browse source
This commit is contained in:
Lennart Poettering 2010-01-05 22:52:57 +01:00
commit 6dfb1ee27e
18 changed files with 1723 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pulse/mainloop.c
View file

@ -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