dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2678 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
citats 2004-04-12 19:56:32 +00:00
parent ec4d7ac596
commit f7af9592a0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/asterisk/lock.h
View File

@ -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;
@ -155,11 +160,6 @@ static inline int __ast_pthread_mutex_destroy(char *filename, int lineno, char *
#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;
#define ast_mutex_lock(t) pthread_mutex_lock(t)