diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-23 22:21:06 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-23 22:21:06 +0000 |
| commit | 2b62a76211fbd650f54f3324b6d4622442b75932 (patch) | |
| tree | 00def5eef024e510d1d50ee96b3647ff045f84df /include | |
| parent | bf12514291975829ffcfe6dd2a456f4172d4e672 (diff) | |
Merge of timedwrlock detection broke build.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@190419 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/lock.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 961f3a294..b37156a10 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); |