diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-09 13:49:42 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-09 13:49:42 +0000 |
| commit | f87ac859605b6e34863bdd4f9da33426d78046f5 (patch) | |
| tree | 6edf362d5c786b692411e909140c6f6a3f8bc292 /include | |
| parent | 86327e6afc935889c27c3d31db61f05aaec99732 (diff) | |
Lock fixes for FreeBSD (bug #1810)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3179 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rwxr-xr-x | include/asterisk/lock.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 4c82928e2..309c7ab82 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; |