diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-03-17 10:11:31 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-03-17 10:11:31 +0000 |
| commit | 46a32546c924213322a0d0d5b6d636d2f58094c0 (patch) | |
| tree | 2266b13e8fd91a2595fc1cadf0bef12cce712589 /nptl/sysdeps/pthread | |
| parent | fb2ee178fa1e50dd1ec4b8ff5300f13afbbb1dd9 (diff) | |
| download | glibc-46a32546c924213322a0d0d5b6d636d2f58094c0.tar.gz glibc-46a32546c924213322a0d0d5b6d636d2f58094c0.tar.xz glibc-46a32546c924213322a0d0d5b6d636d2f58094c0.zip | |
Update.
2003-03-17 Ulrich Drepper <drepper@redhat.com> * localedata/en_ZA: hanged %x for LC_TIME to use dd/mm/ccyy. Added ^ to LC_MESSAGES regex "^[yY].*". Confirmed LC_PAPER adn LC_MEASUREMENT settings. Added country and language names to LC_ADDRESS. Added missing info for LC_TELEPHONE. Patch by Dwayne Bailey <dwayne@obsidian.co.za>.
Diffstat (limited to 'nptl/sysdeps/pthread')
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_cond_timedwait.c | 3 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_cond_wait.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/nptl/sysdeps/pthread/pthread_cond_timedwait.c b/nptl/sysdeps/pthread/pthread_cond_timedwait.c index 0635e6ed93..af9929c500 100644 --- a/nptl/sysdeps/pthread/pthread_cond_timedwait.c +++ b/nptl/sysdeps/pthread/pthread_cond_timedwait.c @@ -134,8 +134,7 @@ __pthread_cond_timedwait (cond, mutex, abstime) /* Check whether we are eligible for wakeup. */ val = cond->__data.__wakeup_seq; - if (cond->__data.__woken_seq >= seq - && cond->__data.__woken_seq < val) + if (val > seq && cond->__data.__woken_seq < val) break; /* Not woken yet. Maybe the time expired? */ diff --git a/nptl/sysdeps/pthread/pthread_cond_wait.c b/nptl/sysdeps/pthread/pthread_cond_wait.c index b681ef26fd..412bca9c25 100644 --- a/nptl/sysdeps/pthread/pthread_cond_wait.c +++ b/nptl/sysdeps/pthread/pthread_cond_wait.c @@ -117,7 +117,7 @@ __pthread_cond_wait (cond, mutex) # error "No valid byte order" #endif - while (1) + do { /* Prepare to wait. Release the condvar futex. */ lll_mutex_unlock (cond->__data.__lock); @@ -137,10 +137,8 @@ __pthread_cond_wait (cond, mutex) /* Check whether we are eligible for wakeup. */ val = cond->__data.__wakeup_seq; - if (cond->__data.__woken_seq >= seq - && cond->__data.__woken_seq < val) - break; } + while (! (val > seq && cond->__data.__woken_seq < val)); /* Another thread woken up. */ ++cond->__data.__woken_seq; |