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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@255813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Tilghman Lesher 16 years ago
parent 84ad636a56
commit b99bf76241

@ -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;

Loading…
Cancel
Save