From 84a6069c3cda42e8cdec6932d0e4da9d4eec088a Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 1 Aug 2009 23:52:24 +0300 Subject: [PATCH] Win32: unimplement thread result This is never used currently. Removing it simplifies the next commits. --- include/vlc_threads.h | 1 - src/misc/w32thread.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 55fea78859..fd00fd2275 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -129,7 +129,6 @@ struct vlc_timer_t typedef struct { HANDLE handle; - void *result; #if defined( UNDER_CE ) HANDLE cancel_event; #endif diff --git a/src/misc/w32thread.c b/src/misc/w32thread.c index e0e06a717e..afbacfa5eb 100644 --- a/src/misc/w32thread.c +++ b/src/misc/w32thread.c @@ -427,7 +427,7 @@ static unsigned __stdcall vlc_entry (void *p) #endif vlc_threadvar_set (cancel_key, &cancel_data); - data.handle->result = data.func (data.data); + data.func (data.data); return 0; } @@ -505,8 +505,7 @@ void vlc_join (vlc_thread_t handle, void **result) == WAIT_IO_COMPLETION); CloseHandle (handle->handle); - if (result) - *result = handle->result; + assert (result == NULL); /* <- FIXME if ever needed */ #ifdef UNDER_CE CloseHandle (handle->cancel_event); #endif -- 2.39.5