[Asterisk-cvs] asterisk/include/asterisk lock.h,1.12,1.13

[citats at lists.digium.com]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/home/citats/cvs/asterisk/include/asterisk

Modified Files:
	lock.h 
Log Message:
Change mutex defines so it should work on OS that don't have the _NP mutex types.  Also move the #defines up so we don't need to duplicate them


Index: lock.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/lock.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- lock.h	6 Apr 2004 20:57:15 -0000	1.12
+++ lock.h	12 Apr 2004 19:56:32 -0000	1.13
@@ -19,6 +19,17 @@
 #define AST_PTHREADT_NULL (pthread_t) -1
 #define AST_PTHREADT_STOP (pthread_t) -2
 
+/* From now on, Asterisk REQUIRES Recursive (not error checking) mutexes
+   and will not run without them. */
+
+#ifdef PTHREAD_MUTEX_RECURSIVE_NP
+#define AST_MUTEX_INITIALIZER      PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#define AST_MUTEX_KIND             PTHREAD_MUTEX_RECURSIVE_NP
+#else
+#define AST_MUTEX_INITIALIZER      PTHREAD_MUTEX_INITIALIZER
+#define AST_MUTEX_KIND             PTHREAD_MUTEX_RECURSIVE
+#endif
+
 #ifdef DEBUG_THREADS
 
 #ifdef THREAD_CRASH
@@ -30,12 +41,6 @@
 #include <stdio.h>
 #include <unistd.h>
 
-/* 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;
 	char *file;
@@ -154,11 +159,6 @@
 #define pthread_mutex_destroy use_ast_pthread_mutex_destroy_instead_of_pthread_mutex_destroy
 
 #else /* DEBUG_THREADS */
-
-/* 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
 
 typedef pthread_mutex_t ast_mutex_t;