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

basic: move missing_mman.h -> include/sys/mman.h

This also makes memfd-util.h include sys/mman.h, as it is necessary for
specifying flags to memfd_create_wrapper() or memfd_new_full().
---

diff --git a/src/basic/missing_mman.h b/src/basic/include/sys/mman.h
similarity index 62%
rename from src/basic/missing_mman.h
rename to src/basic/include/sys/mman.h
index b3f79935fec..50b03bddf03 100644
--- a/src/basic/missing_mman.h
+++ b/src/basic/include/sys/mman.h
@@ -1,20 +1,18 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/mman.h> /* IWYU pragma: export */
-
-#include "forward.h"
+#include_next <sys/mman.h>
 
 /* since glibc-2.38 */
 #ifndef MFD_NOEXEC_SEAL
 #  define MFD_NOEXEC_SEAL 0x0008U
 #else
-assert_cc(MFD_NOEXEC_SEAL == 0x0008U);
+_Static_assert(MFD_NOEXEC_SEAL == 0x0008U, "");
 #endif
 
 /* since glibc-2.38 */
 #ifndef MFD_EXEC
 #  define MFD_EXEC 0x0010U
 #else
-assert_cc(MFD_EXEC == 0x0010U);
+_Static_assert(MFD_EXEC == 0x0010U, "");
 #endif
diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c
index d3a1a8457e0..a7adab2bfa2 100644
--- a/src/basic/memfd-util.c
+++ b/src/basic/memfd-util.c
@@ -9,7 +9,6 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "memfd-util.h"
-#include "missing_mman.h"
 #include "missing_sched.h"
 #include "string-util.h"
 #include "utf8.h"
diff --git a/src/basic/memfd-util.h b/src/basic/memfd-util.h
index efa2f7c616b..befe41ac436 100644
--- a/src/basic/memfd-util.h
+++ b/src/basic/memfd-util.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <sys/mman.h>           /* IWYU pragma: export */
+
 #include "forward.h"
 
 int memfd_create_wrapper(const char *name, unsigned mode);
diff --git a/src/home/homed-home.c b/src/home/homed-home.c
index 90e3944f6bb..d8683b82114 100644
--- a/src/home/homed-home.c
+++ b/src/home/homed-home.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <sys/mman.h>
 #include <sys/vfs.h>
 #include <unistd.h>
 
@@ -29,7 +28,6 @@
 #include "json-util.h"
 #include "log.h"
 #include "memfd-util.h"
-#include "missing_mman.h"
 #include "mkdir.h"
 #include "ordered-set.h"
 #include "parse-util.h"
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index a428108d145..4288bd4f3f5 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <sys/mman.h>
 #include <sys/statvfs.h>
 #include <unistd.h>
 
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 22ae0120414..64f4f0e2238 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <sys/mman.h>
-
 #include "sd-bus.h"
 
 #include "alloc-util.h"
diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c
index 8a1e0b1fdf1..e838e7e0d7c 100644
--- a/src/libsystemd/sd-journal/journal-send.c
+++ b/src/libsystemd/sd-journal/journal-send.c
@@ -18,7 +18,6 @@
 #include "journal-send.h"
 #include "log.h"
 #include "memfd-util.h"
-#include "missing_mman.h"
 #include "process-util.h"
 #include "socket-util.h"
 #include "stdio-util.h"
diff --git a/src/shared/data-fd-util.c b/src/shared/data-fd-util.c
index a9b799bd610..c91d0561497 100644
--- a/src/shared/data-fd-util.c
+++ b/src/shared/data-fd-util.c
@@ -8,7 +8,6 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "memfd-util.h"
-#include "missing_mman.h"
 #include "tmpfile-util.h"
 
 /* When the data is smaller or equal to 64K, try to place the copy in a memfd */
diff --git a/src/shared/serialize.c b/src/shared/serialize.c
index a0b41b281e5..f7d60ac0b75 100644
--- a/src/shared/serialize.c
+++ b/src/shared/serialize.c
@@ -17,7 +17,6 @@
 #include "image-policy.h"
 #include "log.h"
 #include "memfd-util.h"
-#include "missing_mman.h"
 #include "parse-util.h"
 #include "pidref.h"
 #include "ratelimit.h"
diff --git a/src/test/test-memfd-util.c b/src/test/test-memfd-util.c
index 2cfae57f66d..971a9a8dc0a 100644
--- a/src/test/test-memfd-util.c
+++ b/src/test/test-memfd-util.c
@@ -5,7 +5,6 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "memfd-util.h"
-#include "missing_mman.h"
 #include "tests.h"
 
 TEST(memfd_get_sealed) {