[asterisk-commits] branch 1.2 - commit revision 7219

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue Nov 29 08:26:22 2005
New Revision: 7219

URL: http://svn.digium.com/view/asterisk?rev=7219&view=rev
Log:
do the multiple-lock check for cond_wait properly...

Modified:
    branches/1.2/include/asterisk/lock.h

Modified: branches/1.2/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/branches/1.2/include/asterisk/lock.h?rev=7219&r1=7218&r2=7219&view=diff
==============================================================================
--- branches/1.2/include/asterisk/lock.h (original)
+++ branches/1.2/include/asterisk/lock.h Tue Nov 29 08:26:22 2005
@@ -396,7 +396,7 @@
 #endif
 	}
 
-	if (t->reentrancy)
+	if (t->reentrancy > 1)
 		__ast_mutex_logger("%s line %d (%s): mutex '%s' locked more than once, cond_wait will block!\n",
 				   filename, lineno, func, mutex_name);
 
@@ -459,7 +459,7 @@
 #endif
 	}
 
-	if (t->reentrancy)
+	if (t->reentrancy > 1)
 		__ast_mutex_logger("%s line %d (%s): mutex '%s' locked more than once, cond_timedwait will block!\n",
 				   filename, lineno, func, mutex_name);