From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 7 Mar 2023 21:50:02 +0000 (+0100)
Subject: fd-util: move ACQUIRE_NO_XYZ flags to the header the function using them is in
X-Git-Tag: v254-rc1~1075^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92c6f73cc5f8d63618e4efb90f1118eaafc081a6;p=thirdparty%2Fsystemd.git

fd-util: move ACQUIRE_NO_XYZ flags to the header the function using them is in

Follow-up for: b25a930f0e2ebe77bc8b0f0acfac8a3b27ef1f0a
---

diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
index f5357860f55..76be00e4f4e 100644
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -74,14 +74,6 @@ int fd_get_path(int fd, char **ret);
 
 int move_fd(int from, int to, int cloexec);
 
-enum {
-        ACQUIRE_NO_DEV_NULL = 1 << 0,
-        ACQUIRE_NO_MEMFD    = 1 << 1,
-        ACQUIRE_NO_PIPE     = 1 << 2,
-        ACQUIRE_NO_TMPFILE  = 1 << 3,
-        ACQUIRE_NO_REGULAR  = 1 << 4,
-};
-
 int fd_move_above_stdio(int fd);
 
 int rearrange_stdio(int original_input_fd, int original_output_fd, int original_error_fd);
diff --git a/src/shared/data-fd-util.h b/src/shared/data-fd-util.h
index f0e7923556f..4f3d8b8e74d 100644
--- a/src/shared/data-fd-util.h
+++ b/src/shared/data-fd-util.h
@@ -1,7 +1,15 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stddef.h>
+#include <inttypes.h>
+
+enum {
+        ACQUIRE_NO_DEV_NULL = 1 << 0,
+        ACQUIRE_NO_MEMFD    = 1 << 1,
+        ACQUIRE_NO_PIPE     = 1 << 2,
+        ACQUIRE_NO_TMPFILE  = 1 << 3,
+        ACQUIRE_NO_REGULAR  = 1 << 4,
+};
 
 int acquire_data_fd(const void *data, size_t size, unsigned flags);
 int copy_data_fd(int fd);