diff options
author | wm4 <wm4@nowhere> | 2014-07-22 19:22:31 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-07-22 19:26:53 +0200 |
commit | 80d36a0aa297dba0b7039645ec02bbfe36bfb706 (patch) | |
tree | dc70a8444f55b18349c2a11065d4b02ab668e588 | |
parent | 12b2465c1e1d343cd0d3a760a39c8d32babea972 (diff) | |
download | mpv-80d36a0aa297dba0b7039645ec02bbfe36bfb706.tar.bz2 mpv-80d36a0aa297dba0b7039645ec02bbfe36bfb706.tar.xz |
ao_pulse: fix potential compilation problem
It seems at least on some platforms (OSX 10.9), the POSIX wait()
function becomes visible, and conflicts with this unrelated function.
Just rename it.
-rw-r--r-- | audio/out/ao_pulse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c index f97c1f1fdc..3ce11008ff 100644 --- a/audio/out/ao_pulse.c +++ b/audio/out/ao_pulse.c @@ -113,7 +113,7 @@ static void stream_request_cb(pa_stream *s, size_t length, void *userdata) pa_threaded_mainloop_signal(priv->mainloop, 0); } -static int wait(struct ao *ao, pthread_mutex_t *lock) +static int wait_audio(struct ao *ao, pthread_mutex_t *lock) { struct priv *priv = ao->priv; // We don't use this mutex, because pulse like to call stream_request_cb @@ -664,7 +664,7 @@ const struct ao_driver audio_out_pulse = { .pause = pause, .resume = resume, .drain = drain, - .wait = wait, + .wait = wait_audio, .wakeup = wakeup, .priv_size = sizeof(struct priv), .priv_defaults = &(const struct priv) { |