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

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"

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"

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"
 

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"

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;

src/basic/missing_threads.h

@@ -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

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"

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"

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"

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"

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"

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"

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"

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"

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"