From: Karel Zak <kzak@redhat.com>
Date: Mon, 27 Jan 2025 12:40:23 +0000 (+0100)
Subject: c.h: consolidate THREAD_LOCAL.
X-Git-Tag: v2.42-start~69^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee02bd19e4032f4ab14b3e452b0ae0f4ffdab326;p=thirdparty%2Futil-linux.git

c.h: consolidate THREAD_LOCAL.

Let's define this macro in one place only.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/include/c.h b/include/c.h
index d87521be0..ec2d32c38 100644
--- a/include/c.h
+++ b/include/c.h
@@ -604,4 +604,15 @@ static inline void ul_reset_errno(int *saved_errno) {
 
 #define UL_PROTECT_ERRNO __attribute__((__cleanup__(ul_reset_errno))) \
                          __attribute__((__unused__)) int __ul_saved_errno = errno
+
+
+/*
+ * thread-local storage
+ */
+#ifdef HAVE_TLS
+# define THREAD_LOCAL static __thread
+#else
+# define THREAD_LOCAL static
+#endif
+
 #endif /* UTIL_LINUX_C_H */
diff --git a/lib/randutils.c b/lib/randutils.c
index 1b03234a4..a486426a3 100644
--- a/lib/randutils.c
+++ b/lib/randutils.c
@@ -20,11 +20,6 @@
 #include "randutils.h"
 #include "nls.h"
 
-#ifdef HAVE_TLS
-#define THREAD_LOCAL static __thread
-#else
-#define THREAD_LOCAL static
-#endif
 
 #ifdef HAVE_GETRANDOM
 # include <sys/random.h>
diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
index fca7e96e2..106af95f6 100644
--- a/libuuid/src/gen_uuid.c
+++ b/libuuid/src/gen_uuid.c
@@ -93,7 +93,6 @@
 #include "sha1.h"
 #include "timeutils.h"
 
-#define THREAD_LOCAL static __thread
 
 #ifdef _WIN32
 static void gettimeofday (struct timeval *tv, void *dummy)