forward: Add more forward declarations

CGroupMask was erronously added to core-forward.h even though it
comes from src/basic so we move it to the right location.

diff --git a/src/basic/forward.h b/src/basic/forward.h
index 666a078eb2298d8ff3a4a5fdf233c99fb0cb3304..2c96c857fc547dcf75a6bf9a49deb47046c2a6cd 100644 (file)
--- a/src/basic/forward.h
+++ b/src/basic/forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include <errno.h>              /* IWYU pragma: export */
 #include <inttypes.h>           /* IWYU pragma: export */
 #include <limits.h>             /* IWYU pragma: export */
@@ -20,10 +22,11 @@
 typedef uint64_t usec_t;
 typedef uint64_t nsec_t;
 
-/* Libc forward declarations */
+/* Libc/Linux forward declarations */
 
 struct dirent;
 struct ether_addr;
+struct fiemap;
 struct file_handle;
 struct glob_t;
 struct group;
@@ -58,6 +61,8 @@ typedef __socklen_t socklen_t;
 
 /* 3rd-party library forward declarations */
 
+enum bpf_map_type;
+
 struct fdisk_context;
 struct fdisk_table;
 struct crypt_device;
@@ -76,6 +81,10 @@ struct iovec_wrapper;
 union in_addr_union;
 union sockaddr_union;
 
+typedef enum CGroupFlags CGroupFlags;
+typedef enum CGroupMask CGroupMask;
+typedef enum ExtractFlags ExtractFlags;
+typedef enum ImageClass ImageClass;
 typedef enum JobMode JobMode;
 typedef enum RuntimeScope RuntimeScope;
 typedef enum TimestampStyle TimestampStyle;
@@ -223,8 +232,12 @@ typedef struct sd_hwdb sd_hwdb;
 
 /* shared/ forward declarations */
 
+typedef int (*copy_progress_bytes_t)(uint64_t n_bytes, void *userdata);
+typedef int (*copy_progress_path_t)(const char *path, const struct stat *st, void *userdata);
+
 struct local_address;
 struct in_addr_prefix;
+struct in_addr_full;
 
 typedef enum AskPasswordFlags AskPasswordFlags;
 typedef enum BootEntryTokenType BootEntryTokenType;
@@ -237,11 +250,14 @@ typedef enum DnsOverTlsMode DnsOverTlsMode;
 typedef enum DnssecMode DnssecMode;
 typedef enum Fido2EnrollFlags Fido2EnrollFlags;
 typedef enum KeySourceType KeySourceType;
+typedef enum LabelFixFlags LabelFixFlags;
 typedef enum MountInNamespaceFlags MountInNamespaceFlags;
 typedef enum NamePolicy NamePolicy;
+typedef enum OutputFlags OutputFlags;
 typedef enum OutputMode OutputMode;
 typedef enum PagerFlags PagerFlags;
 typedef enum PatternCompileCase PatternCompileCase;
+typedef enum RemoveFlags RemoveFlags;
 typedef enum ResolveSupport ResolveSupport;
 typedef enum TPM2Flags TPM2Flags;
 typedef enum Tpm2Support Tpm2Support;
@@ -249,6 +265,8 @@ typedef enum Tpm2UserspaceEventType Tpm2UserspaceEventType;
 typedef enum UnitFileFlags UnitFileFlags;
 typedef enum UnitFilePresetMode UnitFilePresetMode;
 typedef enum UnitFileState UnitFileState;
+typedef enum UnitType UnitType;
+typedef enum UserDBFlags UserDBFlags;
 typedef enum UserRecordLoadFlags UserRecordLoadFlags;
 typedef enum UserStorage UserStorage;
 
@@ -266,6 +284,7 @@ typedef struct FirewallContext FirewallContext;
 typedef struct GroupRecord GroupRecord;
 typedef struct Image Image;
 typedef struct ImagePolicy ImagePolicy;
+typedef struct InstallInfo InstallInfo;
 typedef struct LookupPaths LookupPaths;
 typedef struct LoopDevice LoopDevice;
 typedef struct MountOptions MountOptions;

diff --git a/src/core/core-forward.h b/src/core/core-forward.h
index 59be62c57d67148f9e6655a573ba58bc82e66ffd..a5159ba30681d39d4eaaeb9e538dc8d239fdd74f 100644 (file)
--- a/src/core/core-forward.h
+++ b/src/core/core-forward.h
@@ -7,7 +7,6 @@
 
 typedef enum CGroupDevicePermissions CGroupDevicePermissions;
 typedef enum CGroupDevicePolicy CGroupDevicePolicy;
-typedef enum CGroupMask CGroupMask;
 typedef enum ExecCleanMask ExecCleanMask;
 typedef enum ExecPreserveMode ExecPreserveMode;
 typedef enum FreezerAction FreezerAction;