diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-01 18:21:14 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-01 18:21:14 +0000 |
| commit | fbcd15fbcae3478a8f6fa3895b7f44cfdf32540a (patch) | |
| tree | ace19bdb719811fe4211db0ef98e8541d22e4d32 /include/asterisk | |
| parent | 97ff6bcda5976e05cbbca0df6c0d2cf789638b8f (diff) | |
Merged revisions 255796 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r255796 | tilghman | 2010-04-01 13:16:37 -0500 (Thu, 01 Apr 2010) | 7 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@255813 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
| -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 123ae76d2..cc71322e3 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -80,7 +80,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 */ @@ -355,10 +355,6 @@ static inline int __ast_pthread_mutex_destroy(const char *filename, int lineno, if ((res = pthread_mutex_destroy(&t->mutex))) __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(t); t->file[0] = filename; t->lineno[0] = lineno; |