From ee02bd19e4032f4ab14b3e452b0ae0f4ffdab326 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 27 Jan 2025 13:40:23 +0100 Subject: [PATCH] c.h: consolidate THREAD_LOCAL. Let's define this macro in one place only. Signed-off-by: Karel Zak --- include/c.h | 11 +++++++++++ lib/randutils.c | 5 ----- libuuid/src/gen_uuid.c | 1 - 3 files changed, 11 insertions(+), 6 deletions(-) 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 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) -- 2.47.3