From 672e3e49fbb0216d5409e5b53d858bcbf9248251 Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Tue, 6 Apr 2004 20:08:44 +0000 Subject: Bite the bullet and require RECURSIVE mutexes git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2640 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/lock.h | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'include') diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index aba263c09..673fb48bc 100755 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -30,22 +30,11 @@ #include #include -// #define AST_MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP -// #define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP -#ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP -#define AST_MUTEX_INITIALIZER { PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, NULL, 0, NULL, 0 } -#else -#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP -#define AST_MUTEX_INITIALIZER { PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP, NULL, 0, NULL, 0 } -#else -#define AST_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER, NULL, 0, NULL, 0 } -#endif -#endif -#ifdef PTHREAD_MUTEX_ERRORCHECK_NP -#define AST_MUTEX_KIND PTHREAD_MUTEX_ERRORCHECK_NP -#else -#define AST_MUTEX_KIND PTHREAD_MUTEX_ERRORCHECK -#endif +/* From now on, Asterisk REQUIRES Recursive (not error checking) mutexes + and will not run without them. */ + +#define AST_MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP +#define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP struct ast_mutex_info { pthread_mutex_t mutex; -- cgit v1.2.3