From e882756311c7b06e59fcc8e582f03852b7dcfd30 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 17 Feb 2011 17:16:20 -0500 Subject: reorganize pthread data structures and move the definitions to alltypes.h this allows sys/types.h to provide the pthread types, as required by POSIX. this design also facilitates forcing ABI-compatible sizes in the arch-specific alltypes.h, while eliminating the need for developers changing the internals of the pthread types to poke around with arch-specific headers they may not be able to test. --- src/thread/pthread_rwlock_timedrdlock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/thread/pthread_rwlock_timedrdlock.c') diff --git a/src/thread/pthread_rwlock_timedrdlock.c b/src/thread/pthread_rwlock_timedrdlock.c index 290327de..1e76a8e1 100644 --- a/src/thread/pthread_rwlock_timedrdlock.c +++ b/src/thread/pthread_rwlock_timedrdlock.c @@ -4,12 +4,12 @@ int pthread_rwlock_timedrdlock(pthread_rwlock_t *rw, const struct timespec *at) { int w=0; while (pthread_rwlock_tryrdlock(rw)) { - if (!w) a_inc(&rw->__waiters), w++; - if (__timedwait(&rw->__wrlock, 1, CLOCK_REALTIME, at, 0)==ETIMEDOUT) { - if (w) a_dec(&rw->__waiters); + if (!w) a_inc(&rw->_rw_waiters), w++; + if (__timedwait(&rw->_rw_wrlock, 1, CLOCK_REALTIME, at, 0)==ETIMEDOUT) { + if (w) a_dec(&rw->_rw_waiters); return ETIMEDOUT; } } - if (w) a_dec(&rw->__waiters); + if (w) a_dec(&rw->_rw_waiters); return 0; } -- cgit v1.2.1