vlc | branch: master | Thomas Guillem <tho...@gllm.fr> | Mon Aug 20 14:11:52 2018 +0200| [1c994eb2c0b07445d37963c16f0686e6fdc3745f] | committer: Thomas Guillem
misc: background_worker: rename EndTask Fix Windows build (conflict with EndTask). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1c994eb2c0b07445d37963c16f0686e6fdc3745f --- src/misc/background_worker.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc/background_worker.c b/src/misc/background_worker.c index 1f2796e5d3..822da04cb5 100644 --- a/src/misc/background_worker.c +++ b/src/misc/background_worker.c @@ -175,7 +175,7 @@ static void background_worker_Destroy(struct background_worker *worker) free(worker); } -static void EndTask(struct background_thread *thread, struct task *task) +static void TerminateTask(struct background_thread *thread, struct task *task) { struct background_worker *worker = thread->owner; task_Destroy(worker, task); @@ -233,7 +233,7 @@ static void* Thread( void* data ) void *handle; if (worker->conf.pf_start(worker->owner, task->entity, &handle)) { - EndTask(thread, task); + TerminateTask(thread, task); continue; } @@ -255,7 +255,7 @@ static void* Thread( void* data ) || worker->conf.pf_probe(worker->owner, handle)) { worker->conf.pf_stop(worker->owner, handle); - EndTask(thread, task); + TerminateTask(thread, task); break; } } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits