Update from gnulib.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 32546130fe1abcc820cdf29450cc9ca50ea41476..fe1a85ff36e4b57fde90390624cb6184af169e14 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-17  Bruno Haible  <bruno@clisp.org>
+
+       * lock.h (gl_carray_waitqueue_t): Renamed from gl_waitqueue_t.
+       (gl_rwlock_t): Update.
+       * lock.c (gl_waitqueue_t): Alias to gl_carray_waitqueue_t.
+
 2008-09-22  Eric Blake  <ebb9@byu.net>
            Bruno Haible  <bruno@clisp.org>
 

diff --git a/gettext-runtime/intl/lock.c b/gettext-runtime/intl/lock.c
index b2dd5b2d7afa4800a3fcde4ac79e1c0ccb036021..dcc2db0e879cf23d3ab67c469e639a387a5a5b25 100644 (file)
--- a/gettext-runtime/intl/lock.c
+++ b/gettext-runtime/intl/lock.c
@@ -681,6 +681,9 @@ glthread_lock_destroy_func (gl_lock_t *lock)
 
 /* ------------------------- gl_rwlock_t datatype ------------------------- */
 
+/* In this file, the waitqueues are implemented as circular arrays.  */
+#define gl_waitqueue_t gl_carray_waitqueue_t
+
 static inline void
 gl_waitqueue_init (gl_waitqueue_t *wq)
 {

diff --git a/gettext-runtime/intl/lock.h b/gettext-runtime/intl/lock.h
index c7afa66b1fd108d9011850f23dd6d016a9f0159a..7f4c1b0bbcca34be3dbdb98fade08bae2bdacc9c 100644 (file)
--- a/gettext-runtime/intl/lock.h
+++ b/gettext-runtime/intl/lock.h
@@ -676,13 +676,13 @@ typedef struct
           unsigned int alloc; /* length of allocated array */
           unsigned int offset; /* index of first waiting thread in array */
         }
-        gl_waitqueue_t;
+        gl_carray_waitqueue_t;
 typedef struct
         {
           gl_spinlock_t guard; /* protects the initialization */
           CRITICAL_SECTION lock; /* protects the remaining fields */
-          gl_waitqueue_t waiting_readers; /* waiting readers */
-          gl_waitqueue_t waiting_writers; /* waiting writers */
+          gl_carray_waitqueue_t waiting_readers; /* waiting readers */
+          gl_carray_waitqueue_t waiting_writers; /* waiting writers */
           int runcount; /* number of readers running, or -1 when a writer runs */
         }
         gl_rwlock_t;