From 08c9634115d9738ac13d383097c1fbdcaf396b81 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 23 Apr 2009 22:21:06 +0000 Subject: [PATCH] Merge of timedwrlock detection broke build. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@190419 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/lock.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 961f3a294b..b37156a10c 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -1047,12 +1047,12 @@ static inline int _ast_rwlock_timedrdlock(ast_rwlock_t *lock, const char *name, 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 @@ static inline int _ast_rwlock_timedwrlock(ast_rwlock_t *lock, const char *name, 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);