about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-01-13 21:17:44 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-02-09 13:56:48 +0100
commitf827f0e473d0aab4b34a5618a2a2ed89ecb88347 (patch)
treec70b50c1f192b7f07565d2ccc8b4ffc32e6747cf
parent0c0361235ca7d4f5be0f88fe9b03afcf6a3cb8c6 (diff)
downloadglibc-f827f0e473d0aab4b34a5618a2a2ed89ecb88347.tar.gz
glibc-f827f0e473d0aab4b34a5618a2a2ed89ecb88347.tar.xz
glibc-f827f0e473d0aab4b34a5618a2a2ed89ecb88347.zip
htl: Make __PTHREAD_ONCE_INIT more flexible
by moving its (struct __pthread_once) cast into PTHREAD_ONCE_INIT.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-rw-r--r--sysdeps/htl/bits/types/struct___pthread_once.h2
-rw-r--r--sysdeps/htl/pthread.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/htl/bits/types/struct___pthread_once.h b/sysdeps/htl/bits/types/struct___pthread_once.h
index 31a0c0817b..a6b6db708c 100644
--- a/sysdeps/htl/bits/types/struct___pthread_once.h
+++ b/sysdeps/htl/bits/types/struct___pthread_once.h
@@ -28,6 +28,6 @@ struct __pthread_once
 };
 
 #define __PTHREAD_ONCE_INIT \
-	(struct __pthread_once) { 0, __PTHREAD_SPIN_LOCK_INITIALIZER }
+	0, __PTHREAD_SPIN_LOCK_INITIALIZER
 
 #endif /* bits/types/struct___pthread_once.h */
diff --git a/sysdeps/htl/pthread.h b/sysdeps/htl/pthread.h
index 3216860493..38c61e8da3 100644
--- a/sysdeps/htl/pthread.h
+++ b/sysdeps/htl/pthread.h
@@ -802,7 +802,7 @@ extern int pthread_setspecific (pthread_key_t __key, const void *__value)
 
 #include <bits/types/struct___pthread_once.h>
 
-#define PTHREAD_ONCE_INIT __PTHREAD_ONCE_INIT
+#define PTHREAD_ONCE_INIT (struct __pthread_once) { __PTHREAD_ONCE_INIT }
 
 /* Call INIT_ROUTINE if this function has never been called with
    *ONCE_CONTROL, otherwise do nothing.  */