summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorPaweĊ‚ Forysiuk <tuxator@o2.pl>2014-05-28 22:18:38 +0200
committerwm4 <wm4@nowhere>2014-05-28 22:44:43 +0200
commitf289060259113c434a8c69a6ef297415fe0d8f58 (patch)
treeb45c7b8b1e2de89f810a7846369b8bb8648f3729 /misc
parent696733d077f51b09eda43062286f82103763f57d (diff)
downloadmpv-f289060259113c434a8c69a6ef297415fe0d8f58.tar.bz2
mpv-f289060259113c434a8c69a6ef297415fe0d8f58.tar.xz
Fix gcc 4.7 warning about shadowing talloc_parent in mp_dispact_queue
Diffstat (limited to 'misc')
-rw-r--r--misc/dispatch.c4
1 files 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);