[svn-commits] tilghman: branch 1.6.0 r190419 - /branches/1.6.0/include/asterisk/lock.h

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Apr 23 17:21:06 2009
New Revision: 190419

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=190419
Log:
Merge of timedwrlock detection broke build.

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

Modified: branches/1.6.0/include/asterisk/lock.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/include/asterisk/lock.h?view=diff&rev=190419&r1=190418&r2=190419
==============================================================================
--- branches/1.6.0/include/asterisk/lock.h (original)
+++ branches/1.6.0/include/asterisk/lock.h Thu Apr 23 17:21:06 2009
@@ -1047,12 +1047,12 @@
 
 	ast_store_lock_info(AST_RDLOCK, file, line, func, name, lock);
 #ifdef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK
-	res = pthread_rwlock_timedrdlock(&t->lock, abs_timeout);
+	res = pthread_rwlock_timedrdlock(lock, abs_timeout);
 #else
 	do {
 		struct timeval _start = ast_tvnow(), _diff;
 		for (;;) {
-			if (!(res = pthread_rwlock_tryrdlock(&t->lock))) {
+			if (!(res = pthread_rwlock_tryrdlock(lock))) {
 				break;
 			}
 			_diff = ast_tvsub(ast_tvnow(), _start);
@@ -1093,12 +1093,12 @@
 
 	ast_store_lock_info(AST_WRLOCK, file, line, func, name, lock);
 #ifdef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK
-	res = pthread_rwlock_timedwrlock(&t->lock, abs_timeout);
+	res = pthread_rwlock_timedwrlock(lock, abs_timeout);
 #else
 	do {
 		struct timeval _start = ast_tvnow(), _diff;
 		for (;;) {
-			if (!(res = pthread_rwlock_trywrlock(&t->lock))) {
+			if (!(res = pthread_rwlock_trywrlock(lock))) {
 				break;
 			}
 			_diff = ast_tvsub(ast_tvnow(), _start);