From 8148631269734f4ecde7a63ca7432e82c12c0b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 1 Nov 2011 15:23:03 +0200 Subject: [PATCH] w32threads: Wrap the mutex functions in inline functions returning int MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows using these wrappers in the gcrypt mutex callbacks. Signed-off-by: Martin Storsjö --- libavcodec/w32pthreads.h | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/libavcodec/w32pthreads.h b/libavcodec/w32pthreads.h index 7774817518..c015b87a42 100644 --- a/libavcodec/w32pthreads.h +++ b/libavcodec/w32pthreads.h @@ -91,10 +91,26 @@ static void pthread_join(pthread_t thread, void **value_ptr) CloseHandle(thread.handle); } -#define pthread_mutex_init(m, a) InitializeCriticalSection(m) -#define pthread_mutex_destroy(m) DeleteCriticalSection(m) -#define pthread_mutex_lock(m) EnterCriticalSection(m) -#define pthread_mutex_unlock(m) LeaveCriticalSection(m) +static inline int pthread_mutex_init(pthread_mutex_t *m, void* attr) +{ + InitializeCriticalSection(m); + return 0; +} +static inline int pthread_mutex_destroy(pthread_mutex_t *m) +{ + DeleteCriticalSection(m); + return 0; +} +static inline int pthread_mutex_lock(pthread_mutex_t *m) +{ + EnterCriticalSection(m); + return 0; +} +static inline int pthread_mutex_unlock(pthread_mutex_t *m) +{ + LeaveCriticalSection(m); + return 0; +} /* for pre-Windows 6.0 platforms we need to define and use our own condition * variable and api */