diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-07-23 15:18:06 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-07-23 15:18:06 +0200 |
commit | 88d5749f6ae8d391963a12a6221f006de2947e50 (patch) | |
tree | f1de05b054b1ee8b272804a03b621a1dde1d8416 /src/pulsecore/asyncmsgq.c | |
parent | 0225ef68f2876bebd14977882db313fd7f3f6d64 (diff) | |
parent | 3d6278bc31aa7053f1228b3d874ba36f50a8c2d5 (diff) |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Conflicts:
src/daemon/main.c
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; } |