diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c index 09a843c160..6493c83c48 100644 --- a/src/basic/fd-util.c +++ b/src/basic/fd-util.c @@ -16,7 +16,6 @@ #include "format-util.h" #include "fs-util.h" #include "log.h" -#include "missing_fcntl.h" #include "missing_syscall.h" #include "mountpoint-util.h" #include "parse-util.h" @@ -971,7 +970,7 @@ int fd_verify_safe_flags_full(int fd, int extra_flags) { * and since we refuse O_PATH it should be safe. * * RAW_O_LARGEFILE: glibc secretly sets this and neglects to hide it from us if we call fcntl. - * See comment in missing_fcntl.h for more details about this. + * See comment in src/basic/include/fcntl.h for more details about this. * * If 'extra_flags' is specified as non-zero the included flags are also allowed. */ diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h index c0b9c1b51c..7d5b9f3083 100644 --- a/src/basic/fd-util.h +++ b/src/basic/fd-util.h @@ -2,10 +2,10 @@ #pragma once #include +#include #include #include "forward.h" -#include "missing_fcntl.h" /* maximum length of fdname */ #define FDNAME_MAX 255 diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index 4f9b52207f..3a3b09776a 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -16,7 +16,6 @@ #include "label.h" #include "lock-util.h" #include "log.h" -#include "missing_fcntl.h" #include "missing_syscall.h" #include "mkdir.h" #include "path-util.h" diff --git a/src/basic/missing_fcntl.h b/src/basic/include/fcntl.h similarity index 97% rename from src/basic/missing_fcntl.h rename to src/basic/include/fcntl.h index 64f37f5ee8..86e0c8bbf5 100644 --- a/src/basic/missing_fcntl.h +++ b/src/basic/include/fcntl.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include /* IWYU pragma: export */ +#include_next /* This is defined since glibc-2.41. */ #ifndef F_DUPFD_QUERY diff --git a/src/basic/include/sys/mount.h b/src/basic/include/sys/mount.h index 211a552d6a..3f42a61233 100644 --- a/src/basic/include/sys/mount.h +++ b/src/basic/include/sys/mount.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include #include /* IWYU pragma: export */ @@ -10,7 +11,6 @@ #include #include -#include "missing_fcntl.h" #include "missing_syscall_def.h" /* Since glibc-2.37 (774058d72942249f71d74e7f2b639f77184160a6), sys/mount.h includes linux/mount.h, and diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c index 0d5c5041f8..da522227c0 100644 --- a/src/core/dbus-service.c +++ b/src/core/dbus-service.c @@ -22,7 +22,6 @@ #include "glyph-util.h" #include "locale-util.h" #include "manager.h" -#include "missing_fcntl.h" #include "mount-util.h" #include "open-file.h" #include "path-util.h" diff --git a/src/libsystemd/sd-journal/journal-file.h b/src/libsystemd/sd-journal/journal-file.h index 12a6646853..9598879066 100644 --- a/src/libsystemd/sd-journal/journal-file.h +++ b/src/libsystemd/sd-journal/journal-file.h @@ -1,11 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include + #include "compress.h" #include "forward.h" #include "gcrypt-util.h" #include "journal-def.h" -#include "missing_fcntl.h" #include "mmap-cache.h" #include "sparse-endian.h"