diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-01 18:21:31 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-01 18:21:31 +0000 |
| commit | 48bd155db1d2ded05df976087cba881d4ffdf643 (patch) | |
| tree | efd49875f9cf6aef39da97662af83c0816c2f01b /include | |
| parent | 763bf1ce2eac1d4e971cff334ae9869b6b2fbd44 (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.2@255816 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -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 b09ff14b6..e29de6116 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -82,7 +82,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 */ @@ -459,10 +459,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; |