[vlc-devel] [PATCH 2/2] win32: do not (re)initialise config lock

Rémi Denis-Courmont remi at remlab.net
Tue Dec 22 20:37:01 UTC 2020


Le tiistaina 22. joulukuuta 2020, 22.21.32 EET remi at remlab.net a écrit :
> From: Rémi Denis-Courmont <remi at remlab.net>
> 
> This is a static lock. As of 4.0.0-dev-11158-ga18c4d6570, there are no
> needs to initialise static locks on Windows.
> ---
>  src/win32/thread.c | 4 ----
>  2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/src/win32/thread.c b/src/win32/thread.c
> index 60b4232e04..91f3c40eaa 100644
> --- a/src/win32/thread.c
> +++ b/src/win32/thread.c
> @@ -785,8 +785,6 @@ void vlc_threads_setup(libvlc_int_t *vlc)
> 
>  #define LOOKUP(s) (((s##_) = (void *)GetProcAddress(h, #s)) != NULL)
> 
> -extern vlc_rwlock_t config_lock;
> -
>  BOOL WINAPI DllMain (HANDLE hinstDll, DWORD fdwReason, LPVOID lpvReserved)
>  {
>      (void) hinstDll;
> @@ -816,12 +814,10 @@ BOOL WINAPI DllMain (HANDLE hinstDll, DWORD fdwReason,
> LPVOID lpvReserved) InitializeCriticalSection(&setup_lock);
>              InitializeCriticalSection(&super_mutex);
>              InitializeConditionVariable(&super_variable);
> -            vlc_rwlock_init (&config_lock);
>              break;
>          }
> 
>          case DLL_PROCESS_DETACH:
> -            vlc_rwlock_destroy (&config_lock);
>              DeleteCriticalSection(&super_mutex);
>              DeleteCriticalSection(&setup_lock);
>              TlsFree(thread_key);

OS/2 stuff removed locally.

-- 
レミ・デニ-クールモン
http://www.remlab.net/





More information about the vlc-devel mailing list