summaryrefslogtreecommitdiff
path: root/lib/glthread
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2019-07-15 02:35:56 +0200
committerBruno Haible <bruno@clisp.org>2019-07-15 02:35:56 +0200
commitf249808baa3f4f30386185b53bd6ac053a1272e1 (patch)
tree62a1f8136efc28aa03c4578cde89e5dc68364670 /lib/glthread
parent4af8b82e701319864de974558f49588bba270a46 (diff)
downloadgnulib-f249808baa3f4f30386185b53bd6ac053a1272e1.tar.gz
windows-*: Rename glwthread_spinlock_t to glwthread_initguard_t.
* lib/windows-initguard.h: Renamed from lib/windows-spinlock.h. (glwthread_initguard_t): Renamed from glwthread_spinlock_t. (GLWTHREAD_INITGUARD_INIT): Renamed from GLWTHREAD_SPINLOCK_INIT. * lib/windows-mutex.h: Update. * lib/windows-recmutex.h: Likewise. * lib/windows-timedmutex.h: Likewise. * lib/windows-timedrecmutex.h: Likewise. * lib/windows-cond.h: Likewise. * lib/glthread/lock.h: Likewise. * modules/windows-mutex (Files): Add lib/windows-initguard.h. Remove lib/windows-spinlock.h. * modules/windows-recmutex (Files): Likewise. * modules/windows-timedmutex (Files): Likewise. * modules/windows-timedrecmutex (Files): Likewise. * modules/windows-cond (Files): Likewise. * modules/threads-h (Files): Likewise.
Diffstat (limited to 'lib/glthread')
-rw-r--r--lib/glthread/lock.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/glthread/lock.h b/lib/glthread/lock.h
index bc3a4def38..23d2d98506 100644
--- a/lib/glthread/lock.h
+++ b/lib/glthread/lock.h
@@ -410,7 +410,7 @@ extern int glthread_once_singlethreaded (pthread_once_t *once_control);
# define WIN32_LEAN_AND_MEAN /* avoid including junk */
# include <windows.h>
-# include "windows-spinlock.h"
+# include "windows-initguard.h"
# include "windows-mutex.h"
# include "windows-recmutex.h"
# include "windows-once.h"
@@ -464,7 +464,7 @@ typedef struct
gl_carray_waitqueue_t;
typedef struct
{
- glwthread_spinlock_t guard; /* protects the initialization */
+ glwthread_initguard_t guard; /* protects the initialization */
CRITICAL_SECTION lock; /* protects the remaining fields */
gl_carray_waitqueue_t waiting_readers; /* waiting readers */
gl_carray_waitqueue_t waiting_writers; /* waiting writers */
@@ -476,7 +476,7 @@ typedef struct
# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
# define gl_rwlock_initializer \
- { GLWTHREAD_SPINLOCK_INIT }
+ { GLWTHREAD_INITGUARD_INIT }
# define glthread_rwlock_init(LOCK) \
(glthread_rwlock_init_func (LOCK), 0)
# define glthread_rwlock_rdlock(LOCK) \