From 17a72827c8fc50cb43f42e8f49e15e35dae6183f Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 1 Apr 2010 18:16:37 +0000 Subject: 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 --- include/asterisk/lock.h | 6 +----- 1 file changed, 1 insertion(+), 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; -- cgit v1.2.3