From 92953ea03d66c0cbf34d69eaa84c391e1b95981f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 18 Jun 2025 09:32:01 +0900 Subject: [PATCH] basic: move missing_pidfd.h -> include/sys/pidfd.h --- src/basic/{missing_pidfd.h => include/sys/pidfd.h} | 9 ++++++--- src/basic/pidfd-util.h | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) rename src/basic/{missing_pidfd.h => include/sys/pidfd.h} (92%) diff --git a/src/basic/missing_pidfd.h b/src/basic/include/sys/pidfd.h similarity index 92% rename from src/basic/missing_pidfd.h rename to src/basic/include/sys/pidfd.h index 968875e8959..de13144524b 100644 --- a/src/basic/missing_pidfd.h +++ b/src/basic/include/sys/pidfd.h @@ -2,15 +2,17 @@ #pragma once #include +#include + +/* since glibc-2.36 */ #if HAVE_PIDFD_OPEN -#include /* IWYU pragma: export */ +#include_next #endif +/* since glibc-2.41 */ #ifndef PIDFS_IOCTL_MAGIC # define PIDFS_IOCTL_MAGIC 0xFF -#endif -#ifndef PIDFD_GET_CGROUP_NAMESPACE # define PIDFD_GET_CGROUP_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 1) # define PIDFD_GET_IPC_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 2) # define PIDFD_GET_MNT_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 3) @@ -23,6 +25,7 @@ # define PIDFD_GET_UTS_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 10) #endif +/* defined in linux/pidfd.h */ #ifndef PIDFD_GET_INFO struct pidfd_info { __u64 mask; diff --git a/src/basic/pidfd-util.h b/src/basic/pidfd-util.h index e998b8a3bcf..0cc247ced16 100644 --- a/src/basic/pidfd-util.h +++ b/src/basic/pidfd-util.h @@ -1,8 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include /* IWYU pragma: export */ + #include "forward.h" -#include "missing_pidfd.h" /* IWYU pragma: export */ #include "missing_syscall.h" /* IWYU pragma: export */ int pidfd_get_namespace(int fd, unsigned long ns_type_cmd); -- 2.47.3