diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-07-17 21:06:58 +0200 |
|---|---|---|
| committer | Daniel Mack <daniel@caiaq.de> | 2009-07-17 21:06:58 +0200 |
| commit | c6d330ef91ce401660f907536b1bfd0591c14c2a (patch) | |
| tree | 44684b85773315a66d7d92c910aa28463f76e0f6 /src/pulsecore/asyncmsgq.c | |
| parent | 63f2ed6dd7b4b87dbe175f8dda35204dee8737e0 (diff) | |
| parent | d18eb61bd2fe5940bccc2b5fcda4029159021d00 (diff) | |
Merge branch 'osx' of git://gitorious.org/~flameeyes/pulseaudio/flameeyes-pulseaudio
Diffstat (limited to 'src/pulsecore/asyncmsgq.c')
| -rw-r--r-- | src/pulsecore/asyncmsgq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pulsecore/asyncmsgq.c b/src/pulsecore/asyncmsgq.c index e191b05f..083d9de2 100644 --- a/src/pulsecore/asyncmsgq.c +++ b/src/pulsecore/asyncmsgq.c @@ -172,11 +172,11 @@ int pa_asyncmsgq_send(pa_asyncmsgq *a, pa_msgobject *object, int code, const voi return i.ret; } -int pa_asyncmsgq_get(pa_asyncmsgq *a, pa_msgobject **object, int *code, void **userdata, int64_t *offset, pa_memchunk *chunk, pa_bool_t wait) { +int pa_asyncmsgq_get(pa_asyncmsgq *a, pa_msgobject **object, int *code, void **userdata, int64_t *offset, pa_memchunk *chunk, pa_bool_t wait_op) { pa_assert(PA_REFCNT_VALUE(a) > 0); pa_assert(!a->current); - if (!(a->current = pa_asyncq_pop(a->asyncq, wait))) { + if (!(a->current = pa_asyncq_pop(a->asyncq, wait_op))) { /* pa_log("failure"); */ return -1; } |