diff options
| author | Mark Spencer <markster@digium.com> | 2004-04-06 20:08:44 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-04-06 20:08:44 +0000 |
| commit | 672e3e49fbb0216d5409e5b53d858bcbf9248251 (patch) | |
| tree | be814997cf4fa3eb096e095242abd0fd95739d29 /include | |
| parent | 1d8f780f459afff93c1cae330937a1d0ef4fa1fc (diff) | |
Bite the bullet and require RECURSIVE mutexes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2640 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rwxr-xr-x | include/asterisk/lock.h | 21 |
1 files changed, 5 insertions, 16 deletions
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 <stdio.h> #include <unistd.h> -// #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; |