diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-04-01 18:16:37 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-04-01 18:16:37 +0000 |
| commit | 17a72827c8fc50cb43f42e8f49e15e35dae6183f (patch) | |
| tree | 36323c3e3bd508245c995aaa280118e462311283 | |
| parent | ad3af5934573db8790c696dcf621a84f65ff14fc (diff) | |
Fix DEBUG_THREADS build on Darwin.
(closes issue #16828)
Reported by: oej
Patches:
20100331__issue16828.diff.txt uploaded by tilghman (license 14)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@255796 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | include/asterisk/lock.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 572d814a8..f1a061cc8 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -83,7 +83,7 @@ #define AST_PTHREADT_NULL (pthread_t) -1 #define AST_PTHREADT_STOP (pthread_t) -2 -#if defined(SOLARIS) || defined(BSD) +#if (defined(SOLARIS) || defined(BSD)) && !defined(__Darwin__) #define AST_MUTEX_INIT_W_CONSTRUCTORS #endif /* SOLARIS || BSD */ @@ -460,10 +460,6 @@ static inline int __ast_pthread_mutex_destroy(const char *filename, int lineno, __ast_mutex_logger("%s line %d (%s): Error destroying mutex %s: %s\n", filename, lineno, func, mutex_name, strerror(res)); } -#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP - else - t->mutex = PTHREAD_MUTEX_INIT_VALUE; -#endif ast_reentrancy_lock(lt); lt->file[0] = filename; lt->lineno[0] = lineno; |