basic: move missing_fcntl.h -> include/fcntl.h

diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index 09a843c160c10c8d2afc951a4868ffcab7d55343..6493c83c48e233ab9b8abba651abe8e567ea933e 100644 (file)
--- 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 c0b9c1b51ca4188ca965eae6032c974d3860c185..7d5b9f30831f67714704a82f6ba1bfdd5c9f3af4 100644 (file)
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -2,10 +2,10 @@
 #pragma once
 
 #include <dirent.h>
+#include <fcntl.h>
 #include <stdio.h>
 
 #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 4f9b52207fa319be6ffc6c9bca425380557326bb..3a3b09776a3df7ae8783e4e231128c4b80703315 100644 (file)
--- 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 64f37f5ee86cb3c366c840f3aa82b505e230a82b..86e0c8bbf5eb976463cb1e9076b32d836b8a6ea3 100644 (file)
--- 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 <fcntl.h> /* IWYU pragma: export */
+#include_next <fcntl.h>
 
 /* 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 211a552d6a332e3f0be5e26a5de56bd26ad00020..3f42a61233c5e1b929ea10ad224fc6ea2ae5bbe1 100644 (file)
--- 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 <fcntl.h>
 #include <features.h>
 #include <linux/fs.h>
 #include <linux/mount.h> /* IWYU pragma: export */
@@ -10,7 +11,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-#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 0d5c5041f8f11029c52342410108c64142c490bb..da522227c0c4c6f425f14ebb8cb99b39e0379c17 100644 (file)
--- 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 12a66468530694f0196a3b2be2e3e384cb521dc6..9598879066a2d462b9f37373efc61b38ebd280e8 100644 (file)
--- 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 <fcntl.h>
+
 #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"