[Asterisk-cvs] asterisk/include/asterisk lock.h,1.19,1.20

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv15498/include/asterisk

Modified Files:
	lock.h 
Log Message:
Lock fixes for FreeBSD (bug #1810)


Index: lock.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/lock.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- lock.h	9 Jun 2004 01:45:08 -0000	1.19
+++ lock.h	9 Jun 2004 13:49:42 -0000	1.20
@@ -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 @@
    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;