[Asterisk-cvs] asterisk/include/asterisk lock.h,1.35,1.36

kpfleming kpfleming
Wed Aug 31 20:04:41 CDT 2005


Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv31346/include/asterisk

Modified Files:
	lock.h 
Log Message:
eliminate spurious warnings


Index: lock.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/lock.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- lock.h	31 Aug 2005 02:43:44 -0000	1.35
+++ lock.h	1 Sep 2005 00:05:47 -0000	1.36
@@ -295,7 +295,7 @@
 	}
 #endif
 
-	if (t->thread != pthread_self()) {
+	if (t->reentrancy && (t->thread != pthread_self())) {
 		__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
 				   filename, lineno, func, mutex_name);
 		__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
@@ -342,7 +342,7 @@
 	}
 #endif
 
-	if (t->thread != pthread_self()) {
+	if (t->reentrancy && (t->thread != pthread_self())) {
 		__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
 				   filename, lineno, func, mutex_name);
 		__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
@@ -396,7 +396,7 @@
 	}
 #endif
 
-	if (t->thread != pthread_self()) {
+	if (t->reentrancy && (t->thread != pthread_self())) {
 		__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
 				   filename, lineno, func, mutex_name);
 		__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",




More information about the svn-commits mailing list