[asterisk-commits] tilghman: branch 1.6.0 r255813 - in /branches/1.6.0: ./ include/asterisk/lock.h

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Apr  1 13:21:14 2010
New Revision: 255813

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=255813
Log:
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)
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/lock.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/lock.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/include/asterisk/lock.h?view=diff&rev=255813&r1=255812&r2=255813
==============================================================================
--- branches/1.6.0/include/asterisk/lock.h (original)
+++ branches/1.6.0/include/asterisk/lock.h Thu Apr  1 13:21:14 2010
@@ -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 @@
 	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;