From c5d40f2487a971672b2e3f41f26a4cffac9a5c19 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Tue, 7 May 2024 13:28:41 +0200 Subject: [PATCH] libuuid: drop check for HAVE_TLS MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In the function get_clock() TLS is used unconditionally anyways. Signed-off-by: Thomas Weißschuh --- libuuid/src/gen_uuid.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c index aa353e443..4f3e4c39b 100644 --- a/libuuid/src/gen_uuid.c +++ b/libuuid/src/gen_uuid.c @@ -91,11 +91,7 @@ #include "sha1.h" #include "timeutils.h" -#ifdef HAVE_TLS #define THREAD_LOCAL static __thread -#else -#define THREAD_LOCAL static -#endif #ifdef _WIN32 static void gettimeofday (struct timeval *tv, void *dummy) @@ -585,7 +581,6 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) * the UUID anyway, but returns -1. Otherwise, returns 0. */ static int uuid_generate_time_generic(uuid_t out) { -#ifdef HAVE_TLS /* thread local cache for uuidd based requests */ THREAD_LOCAL int num = 0; THREAD_LOCAL int cache_size = CS_MIN; @@ -638,10 +633,6 @@ static int uuid_generate_time_generic(uuid_t out) { last_used = cache_size; return 0; } -#else - if (get_uuid_via_daemon(UUIDD_OP_TIME_UUID, out, 0) == 0) - return 0; -#endif return __uuid_generate_time(out, NULL); } -- 2.47.3