From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 28 Feb 2025 19:57:49 +0000 (+0900)
Subject: missing_threads.h: threads.h exists since glibc-2.28
X-Git-Tag: v258-rc1~1195^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e75372958d0c7139338dafcd72d94a91eb614e9c;p=thirdparty%2Fsystemd.git

missing_threads.h: threads.h exists since glibc-2.28
---

diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index 941412d3c5e..11d7e95cb65 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/prctl.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -17,7 +18,6 @@
 #include "log.h"
 #include "logarithm.h"
 #include "macro.h"
-#include "missing_threads.h"
 #include "parse-util.h"
 #include "pidref.h"
 #include "stat-util.h"
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index a5b9829f94e..5cedd45f3d9 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -8,6 +8,7 @@
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/xattr.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -24,7 +25,6 @@
 #include "macro.h"
 #include "missing_fs.h"
 #include "missing_magic.h"
-#include "missing_threads.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/basic/confidential-virt.c b/src/basic/confidential-virt.c
index 796ae6143c9..ebb50e311da 100644
--- a/src/basic/confidential-virt.c
+++ b/src/basic/confidential-virt.c
@@ -6,6 +6,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "confidential-virt-fundamental.h"
@@ -13,7 +14,6 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "missing_threads.h"
 #include "string-table.h"
 #include "utf8.h"
 
diff --git a/src/basic/log.c b/src/basic/log.c
index 2250dfe9272..51f3a4eeada 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -11,6 +11,7 @@
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <sys/un.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "sd-messages.h"
@@ -26,7 +27,6 @@
 #include "log.h"
 #include "macro.h"
 #include "missing_syscall.h"
-#include "missing_threads.h"
 #include "parse-util.h"
 #include "proc-cmdline.h"
 #include "process-util.h"
diff --git a/src/basic/memory-util.c b/src/basic/memory-util.c
index 46ff4074a42..1596727e58f 100644
--- a/src/basic/memory-util.c
+++ b/src/basic/memory-util.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <threads.h>
 #include <unistd.h>
 
 #include "memory-util.h"
-#include "missing_threads.h"
 
 size_t page_size(void) {
         static thread_local size_t pgsz = 0;
diff --git a/src/basic/missing_threads.h b/src/basic/missing_threads.h
deleted file mode 100644
index c7da1dbd5e0..00000000000
--- a/src/basic/missing_threads.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-/* If threads.h doesn't exist, then define our own thread_local to match C11's thread_local. */
-#if HAVE_THREADS_H
-#  include <threads.h>
-#elif !(defined(thread_local))
-#  ifndef __STDC_NO_THREADS__
-#    define thread_local _Thread_local
-#  else
-#    define thread_local __thread
-#  endif
-#endif
diff --git a/src/basic/pidfd-util.c b/src/basic/pidfd-util.c
index 82064e162a5..9eeb379682d 100644
--- a/src/basic/pidfd-util.c
+++ b/src/basic/pidfd-util.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <sys/ioctl.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "errno-util.h"
@@ -10,7 +11,6 @@
 #include "memory-util.h"
 #include "missing_fs.h"
 #include "missing_magic.h"
-#include "missing_threads.h"
 #include "mountpoint-util.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 2779f3a234c..80eeca6c0a8 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -15,6 +15,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <syslog.h>
+#include <threads.h>
 #include <unistd.h>
 #if HAVE_VALGRIND_VALGRIND_H
 #include <valgrind/valgrind.h>
@@ -43,7 +44,6 @@
 #include "memory-util.h"
 #include "missing_sched.h"
 #include "missing_syscall.h"
-#include "missing_threads.h"
 #include "mountpoint-util.h"
 #include "namespace-util.h"
 #include "nulstr-util.h"
diff --git a/src/basic/psi-util.c b/src/basic/psi-util.c
index 2a43b03d974..9ac25e7bff1 100644
--- a/src/basic/psi-util.c
+++ b/src/basic/psi-util.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <stdio.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -8,7 +9,6 @@
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "missing_threads.h"
 #include "parse-util.h"
 #include "psi-util.h"
 #include "string-util.h"
diff --git a/src/basic/random-util.c b/src/basic/random-util.c
index fec4f810358..dbabf803831 100644
--- a/src/basic/random-util.c
+++ b/src/basic/random-util.c
@@ -11,6 +11,7 @@
 #include <sys/auxv.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
+#include <threads.h>
 
 #include "alloc-util.h"
 #include "env-util.h"
@@ -21,7 +22,6 @@
 #include "iovec-util.h"
 #include "missing_random.h"
 #include "missing_syscall.h"
-#include "missing_threads.h"
 #include "parse-util.h"
 #include "pidfd-util.h"
 #include "process-util.h"
diff --git a/src/basic/signal-util.c b/src/basic/signal-util.c
index 32d37e68dd1..7abee0d29f5 100644
--- a/src/basic/signal-util.c
+++ b/src/basic/signal-util.c
@@ -2,11 +2,11 @@
 
 #include <errno.h>
 #include <stdarg.h>
+#include <threads.h>
 
 #include "errno-util.h"
 #include "macro.h"
 #include "missing_syscall.h"
-#include "missing_threads.h"
 #include "parse-util.h"
 #include "signal-util.h"
 #include "stdio-util.h"
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 77f354fd1f4..2f5f14a67f8 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -8,6 +8,7 @@
 #include <sys/time.h>
 #include <sys/timerfd.h>
 #include <sys/types.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -17,7 +18,6 @@
 #include "io-util.h"
 #include "log.h"
 #include "macro.h"
-#include "missing_threads.h"
 #include "missing_timerfd.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/basic/uid-classification.c b/src/basic/uid-classification.c
index 88be896ff4b..90b51ab02b2 100644
--- a/src/basic/uid-classification.c
+++ b/src/basic/uid-classification.c
@@ -1,9 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <threads.h>
+
 #include "chase.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "missing_threads.h"
 #include "string-util.h"
 #include "uid-classification.h"
 #include "user-util.h"
diff --git a/src/basic/virt.c b/src/basic/virt.c
index 0d6fcaee56b..905a37e4a95 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -6,6 +6,7 @@
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -15,7 +16,6 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "macro.h"
-#include "missing_threads.h"
 #include "namespace-util.h"
 #include "process-util.h"
 #include "stat-util.h"
diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
index b2ff1bcb329..7ae94761f83 100644
--- a/src/basic/xattr-util.c
+++ b/src/basic/xattr-util.c
@@ -6,13 +6,13 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/xattr.h>
+#include <threads.h>
 
 #include "alloc-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "macro.h"
 #include "missing_syscall.h"
-#include "missing_threads.h"
 #include "parse-util.h"
 #include "sparse-endian.h"
 #include "stat-util.h"
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index c14d144753e..20e65284817 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -8,6 +8,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
@@ -38,7 +39,6 @@
 #include "macro.h"
 #include "memory-util.h"
 #include "missing_syscall.h"
-#include "missing_threads.h"
 #include "origin-id.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 73b0ee6ef81..ab977153fd9 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -3,6 +3,7 @@
 #include <sys/epoll.h>
 #include <sys/timerfd.h>
 #include <sys/wait.h>
+#include <threads.h>
 
 #include "sd-daemon.h"
 #include "sd-event.h"
@@ -24,7 +25,6 @@
 #include "memory-util.h"
 #include "missing_magic.h"
 #include "missing_syscall.h"
-#include "missing_threads.h"
 #include "missing_wait.h"
 #include "origin-id.h"
 #include "path-util.h"
diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c
index 5028e56bbde..c407b1c8c38 100644
--- a/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/libsystemd/sd-id128/sd-id128.c
@@ -2,6 +2,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "sd-id128.h"
@@ -16,7 +17,6 @@
 #include "keyring-util.h"
 #include "macro.h"
 #include "missing_syscall.h"
-#include "missing_threads.h"
 #include "path-util.h"
 #include "random-util.h"
 #include "stat-util.h"
diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c
index 97f65c561cb..1a154d92759 100644
--- a/src/libsystemd/sd-journal/journal-file.c
+++ b/src/libsystemd/sd-journal/journal-file.c
@@ -9,6 +9,7 @@
 #include <sys/mman.h>
 #include <sys/statvfs.h>
 #include <sys/uio.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "sd-event.h"
@@ -28,7 +29,6 @@
 #include "journal-internal.h"
 #include "lookup3.h"
 #include "memory-util.h"
-#include "missing_threads.h"
 #include "path-util.h"
 #include "prioq.h"
 #include "random-util.h"
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index 2000f86e695..b01f600ba69 100644
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/prctl.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "sd-resolve.h"
@@ -23,7 +24,6 @@
 #include "list.h"
 #include "memory-util.h"
 #include "missing_syscall.h"
-#include "missing_threads.h"
 #include "process-util.h"
 #include "resolve-private.h"
 #include "socket-util.h"
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index ec870d10016..c0ae173783a 100644
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -4,6 +4,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <threads.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -18,7 +19,6 @@
 #include "io-util.h"
 #include "logind-dbus.h"
 #include "logind-inhibit.h"
-#include "missing_threads.h"
 #include "mkdir-label.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/network/networkd-route-util.c b/src/network/networkd-route-util.c
index 6b9810f934d..90fba7a5408 100644
--- a/src/network/networkd-route-util.c
+++ b/src/network/networkd-route-util.c
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/rtnetlink.h>
+#include <threads.h>
 
 #include "alloc-util.h"
 #include "bitfield.h"
 #include "logarithm.h"
-#include "missing_threads.h"
 #include "networkd-address.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c
index 6a13b87b025..0dfafa15634 100644
--- a/src/nss-systemd/nss-systemd.c
+++ b/src/nss-systemd/nss-systemd.c
@@ -3,13 +3,13 @@
 #include <nss.h>
 #include <pthread.h>
 #include <string.h>
+#include <threads.h>
 
 #include "env-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "log.h"
 #include "macro.h"
-#include "missing_threads.h"
 #include "nss-systemd.h"
 #include "nss-util.h"
 #include "pthread-util.h"
diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
index 0153454b982..c1019f571d5 100644
--- a/src/shared/cgroup-setup.c
+++ b/src/shared/cgroup-setup.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <threads.h>
 #include <unistd.h>
 
 #include "cgroup-setup.h"
@@ -8,7 +9,6 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
-#include "missing_threads.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"