reorganize pthread data structures and move the definitions to alltypes.h

[musl] / src / thread / pthread_rwlock_timedwrlock.c

diff --git a/src/thread/pthread_rwlock_timedwrlock.c b/src/thread/pthread_rwlock_timedwrlock.c
index 9f74964..9682774 100644 (file)
--- a/src/thread/pthread_rwlock_timedwrlock.c
+++ b/src/thread/pthread_rwlock_timedwrlock.c
@@ -4,14 +4,14 @@ int pthread_rwlock_timedwrlock(pthread_rwlock_t *rw, const struct timespec *at)
 {
        int nr, *p, w=0;
        while (pthread_rwlock_trywrlock(rw)==EAGAIN) {
 {
        int nr, *p, w=0;
        while (pthread_rwlock_trywrlock(rw)==EAGAIN) {

-               if (!w) a_inc(&rw->__waiters), w++;
-               if ((nr=rw->__readers)) p = &rw->__readers;
-               else nr=1, p = &rw->__wrlock;
+               if (!w) a_inc(&rw->_rw_waiters), w++;
+               if ((nr=rw->_rw_readers)) p = &rw->_rw_readers;
+               else nr=1, p = &rw->_rw_wrlock;

                if (__timedwait(p, nr, CLOCK_REALTIME, at, 0)==ETIMEDOUT) {
                if (__timedwait(p, nr, CLOCK_REALTIME, at, 0)==ETIMEDOUT) {

-                       if (w) a_dec(&rw->__waiters);
+                       if (w) a_dec(&rw->_rw_waiters);

                        return ETIMEDOUT;
                }
        }
                        return ETIMEDOUT;
                }
        }

-       if (w) a_dec(&rw->__waiters);
+       if (w) a_dec(&rw->_rw_waiters);

        return 0;
 }
        return 0;
 }