Index: include/asterisk/lock.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/lock.h,v retrieving revision 1.12 diff -u -r1.12 lock.h --- include/asterisk/lock.h 6 Apr 2004 20:57:15 -0000 1.12 +++ include/asterisk/lock.h 12 Apr 2004 19:28:55 -0000 @@ -33,8 +33,13 @@ /* 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 +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) + #define AST_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER + #define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE +#else + #define AST_MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP + #define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP +#endif struct ast_mutex_info { pthread_mutex_t mutex; @@ -157,8 +162,14 @@ /* 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 + +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) + #define AST_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER + #define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE +#else + #define AST_MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP + #define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP +#endif typedef pthread_mutex_t ast_mutex_t;