From f289060259113c434a8c69a6ef297415fe0d8f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Wed, 28 May 2014 22:18:38 +0200 Subject: Fix gcc 4.7 warning about shadowing talloc_parent in mp_dispact_queue --- misc/dispatch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/dispatch.c b/misc/dispatch.c index 04def9a24c..6391caa063 100644 --- a/misc/dispatch.c +++ b/misc/dispatch.c @@ -66,9 +66,9 @@ static void queue_dtor(void *p) // The target thread is the thread which created the queue and which calls // mp_dispatch_queue_process(). // Free the dispatch queue with talloc_free(). (It must be empty.) -struct mp_dispatch_queue *mp_dispatch_create(void *talloc_parent) +struct mp_dispatch_queue *mp_dispatch_create(void *ta_parent) { - struct mp_dispatch_queue *queue = talloc_ptrtype(talloc_parent, queue); + struct mp_dispatch_queue *queue = talloc_ptrtype(ta_parent, queue); *queue = (struct mp_dispatch_queue){0}; talloc_set_destructor(queue, queue_dtor); pthread_mutex_init(&queue->exclusive_lock, NULL); -- cgit v1.2.3