diff options
| author | Bruno Haible <bruno@clisp.org> | 2008-10-17 11:36:08 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:15:55 +0200 |
| commit | 6040185e2c279b1c7c4c677fb5b12ffc36397f2b (patch) | |
| tree | 5b83cb3bf1504868ec6c7f2f91b5e5f1d15450df /gettext-runtime | |
| parent | ea06920b30ba1bab57929bf8875a63b332c3e2e6 (diff) | |
| download | external_gettext-6040185e2c279b1c7c4c677fb5b12ffc36397f2b.zip external_gettext-6040185e2c279b1c7c4c677fb5b12ffc36397f2b.tar.gz external_gettext-6040185e2c279b1c7c4c677fb5b12ffc36397f2b.tar.bz2 | |
Update from gnulib.
Diffstat (limited to 'gettext-runtime')
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 6 | ||||
| -rw-r--r-- | gettext-runtime/intl/lock.c | 3 | ||||
| -rw-r--r-- | gettext-runtime/intl/lock.h | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 3254613..fe1a85f 100644 --- 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 b2dd5b2..dcc2db0 100644 --- 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 c7afa66..7f4c1b0 100644 --- 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; |