From de57be6bbd664306c40b0d938a7056ee56ffcb63 Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Wed, 9 Jun 2004 13:49:42 +0000 Subject: [PATCH] Lock fixes for FreeBSD (bug #1810) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3179 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/lock.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 4c82928e2a..309c7ab82b 100755 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -51,15 +51,11 @@ and will not run without them. */ #ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP #define AST_MUTEX_INIT_VAULE { PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, NULL, 0, NULL, 0 } -#else -#define AST_MUTEX_INIT_VAULE { PTHREAD_MUTEX_INITIALIZER, NULL, 0, NULL, 0 } -#endif - -#ifdef PTHREAD_MUTEX_RECURSIVE_NP #define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP #else +#define AST_MUTEX_INIT_VAULE { PTHREAD_MUTEX_INITIALIZER, NULL, 0, NULL, 0 } #define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE -#endif +#endif /* PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP */ struct ast_mutex_info { pthread_mutex_t mutex; @@ -203,15 +199,11 @@ static inline int __ast_pthread_mutex_destroy(char *filename, int lineno, char * and will not run without them. */ #ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP #define AST_MUTEX_INIT_VAULE PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP -#else -#define AST_MUTEX_INIT_VAULE PTHREAD_MUTEX_INITIALIZER -#endif - -#ifdef PTHREAD_MUTEX_RECURSIVE_NP #define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP #else +#define AST_MUTEX_INIT_VAULE PTHREAD_MUTEX_INITIALIZER #define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE -#endif +#endif /* PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP */ typedef pthread_mutex_t ast_mutex_t;