From c415a4816c22de472fc6c4728422684fe7d3956e Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Tue, 24 Dec 2024 16:52:08 +0100 Subject: [PATCH] tree-wide: drop inclusion of linux/memfd.h We carry our own definitions in missing_mman.h, and otherwise sys/mman.h is employed. Let's drop the unneeded detection/inclusion of linux/memfd.h hence. --- meson.build | 1 - src/basic/memfd-util.c | 7 ++----- src/home/homed-home.c | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index aa51a3aead3..efdf0501b32 100644 --- a/meson.build +++ b/meson.build @@ -771,7 +771,6 @@ if not cc.has_header('sys/capability.h') endif foreach header : ['crypt.h', 'linux/ioprio.h', - 'linux/memfd.h', 'linux/time_types.h', 'sys/auxv.h', 'sys/sdt.h', diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c index 9d3983b1816..70ffa93a78f 100644 --- a/src/basic/memfd-util.c +++ b/src/basic/memfd-util.c @@ -1,13 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include -#if HAVE_LINUX_MEMFD_H -#include -#endif #include #include +#include +#include #include "alloc-util.h" #include "errno-util.h" diff --git a/src/home/homed-home.c b/src/home/homed-home.c index fd9d90be902..a6f99713dd6 100644 --- a/src/home/homed-home.c +++ b/src/home/homed-home.c @@ -1,9 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#if HAVE_LINUX_MEMFD_H -#include -#endif - #include #include #include