Update.

	* localedata/en_ZA: Changed %x for LC_TIME to use dd/mm/ccyy.

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 2c19c8385addbd7929bc4da76b4bd4cc521ab7c0..b5ca9ef28753e2b4af0125fda3b626f69cf07c26 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,6 +1,6 @@
 2003-03-17  Ulrich Drepper  <drepper@redhat.com>
 
-       * localedata/en_ZA: hanged %x for LC_TIME to use dd/mm/ccyy.
+       * localedata/en_ZA: Changed %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.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 45ecd028b011aaf6b684714d0112ecb7b57f0f86..03c461222abe0a1610fc65118872c779207a6aff 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-17  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/pthread/pthread_cond_wait.c: Correct exit criteria.
+       * sysdeps/pthread/pthread_cond_timedwait.c: Likewise.
+       * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: Likewise.
+       * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Likewise.
+       Patch by Ewald Snel <ewald@rambo.its.tudelft.nl>.
+
 2003-03-16  Roland McGrath  <roland@redhat.com>
 
        * tst-fork4.c: Include <string.h>.
@@ -7,6 +15,10 @@
 
 2003-03-16  Ulrich Drepper  <drepper@redhat.com>
 
+       * sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S
+       (__lll_mutex_timedlock_wait): Correct expected value after
+       spurious wakeup.  Otherwise we would never wait again.
+
        * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Work around red
        zone versus inline asm stupidity.  Use correct instructions.
 

diff --git a/nptl/DESIGN-condvar.txt b/nptl/DESIGN-condvar.txt
index 7202e414efc57afbbe48e67d882f30d7afe4ff66..4a8212bae1d688d3058959a72618bc9261596c06 100644 (file)
--- a/nptl/DESIGN-condvar.txt
+++ b/nptl/DESIGN-condvar.txt
@@ -65,7 +65,7 @@ cond_timedwait(cv, mutex, timeout):
 
      val = cv->wakeup_seq;
 
-     if (cv->woken_seq >= seq && cv->woken_seq < val) {
+     if (val > seq && cv->woken_seq < val) {
        ret = 0;
        break;
      }