X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_gcrypt.h;h=4bb14f760a0f2cb39286bde7709ceb1eea6e7707;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=4d94344ef1e9951de5ff3977f6e8b6b8f9dbc890;hpb=c5c06b64c806052086e5772d64e540a8db7e4a9b;p=vlc diff --git a/include/vlc_gcrypt.h b/include/vlc_gcrypt.h index 4d94344ef1..4bb14f760a 100644 --- a/include/vlc_gcrypt.h +++ b/include/vlc_gcrypt.h @@ -1,7 +1,7 @@ /***************************************************************************** * vlc_gcrypt.h: VLC thread support for gcrypt ***************************************************************************** - * Copyright (C) 2004-2008 Rémi Denis-Courmont + * Copyright (C) 2004-2010 Rémi Denis-Courmont * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +23,8 @@ * This file implements gcrypt support functions in vlc */ +#include + #ifdef LIBVLC_USE_PTHREAD /** * If possible, use gcrypt-provided thread implementation. This is so that @@ -88,14 +90,13 @@ static inline void vlc_gcrypt_init (void) * plugins linking with gcrypt, and some underlying libraries may use it * behind our back. Only way is to always link gcrypt statically (ouch!) or * have upstream gcrypt provide one shared object per threading system. */ - static vlc_mutex_t lock = VLC_STATIC_MUTEX; static bool done = false; - vlc_mutex_lock (&lock); + vlc_global_lock (VLC_GCRYPT_MUTEX); if (!done) { gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc); done = true; } - vlc_mutex_unlock (&lock); + vlc_global_unlock (VLC_GCRYPT_MUTEX); }