From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 18 Jun 2025 00:02:43 +0000 (+0900)
Subject: basic: move missing_wait.h -> include/sys/wait.h
X-Git-Tag: v258-rc1~193^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a6dcc137caf67adacecb58376da7795dac39d31;p=thirdparty%2Fsystemd.git

basic: move missing_wait.h -> include/sys/wait.h
---

diff --git a/src/basic/missing_wait.h b/src/basic/include/sys/wait.h
similarity index 58%
rename from src/basic/missing_wait.h
rename to src/basic/include/sys/wait.h
index 821df7a9716..0981631cf65 100644
--- a/src/basic/missing_wait.h
+++ b/src/basic/include/sys/wait.h
@@ -1,13 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/wait.h> /* IWYU pragma: export */
-
-#include "forward.h"
+#include_next <sys/wait.h>
 
 /* since glibc-2.36 */
 #ifndef P_PIDFD
 #  define P_PIDFD 3
 #else
-assert_cc(P_PIDFD == 3);
+_Static_assert(P_PIDFD == 3, "");
 #endif
diff --git a/src/basic/pidref.c b/src/basic/pidref.c
index 3aee706a9c8..e4c51dd9527 100644
--- a/src/basic/pidref.c
+++ b/src/basic/pidref.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <sys/wait.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -8,7 +9,6 @@
 #include "format-util.h"
 #include "hash-funcs.h"
 #include "log.h"
-#include "missing_wait.h"
 #include "parse-util.h"
 #include "pidfd-util.h"
 #include "pidref.h"
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 3345a6a80a5..671fedf6fd2 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -25,7 +25,6 @@
 #include "logarithm.h"
 #include "memory-util.h"
 #include "missing_magic.h"
-#include "missing_wait.h"
 #include "origin-id.h"
 #include "path-util.h"
 #include "pidfd-util.h"