pakfire: Declare types before trying to import anything else

This should a little bit with the circular imports.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/pakfire/cgroup.h b/src/pakfire/cgroup.h
index 089da68aeb101bb0f65a7d9c4c392b96673d9d7b..375a158d5c6b84d16f5b27918ff8417a67f58498 100644 (file)
--- a/src/pakfire/cgroup.h
+++ b/src/pakfire/cgroup.h
@@ -21,6 +21,8 @@
 #ifndef PAKFIRE_CGROUP_H
 #define PAKFIRE_CGROUP_H
 
+typedef struct pakfire_cgroup pakfire_cgroup;
+
 #include <pakfire/ctx.h>
 
 enum pakfire_cgroup_controllers {
@@ -30,8 +32,6 @@ enum pakfire_cgroup_controllers {
        PAKFIRE_CGROUP_CONTROLLER_IO      = (1 << 3),
 };
 
-typedef struct pakfire_cgroup pakfire_cgroup;
-
 typedef struct pakfire_cgroup_stats {
        // CPU
        struct pakfire_cgroup_cpu_stats {

diff --git a/src/pakfire/jail.h b/src/pakfire/jail.h
index 1b0d709605fd4df03d901a9512ac080da9560333..a64bb66c02b588f3727c608db4324e8ffcb0f0f1 100644 (file)
--- a/src/pakfire/jail.h
+++ b/src/pakfire/jail.h
@@ -23,14 +23,14 @@
 
 #include <limits.h>
 
+typedef struct pakfire_jail pakfire_jail;
+
 #include <pakfire/buffer.h>
 #include <pakfire/cgroup.h>
 #include <pakfire/ctx.h>
 #include <pakfire/env.h>
 #include <pakfire/root.h>
 
-typedef struct pakfire_jail pakfire_jail;
-
 // Input callback
 typedef ssize_t (*pakfire_jail_input_callback)
        (pakfire_ctx* ctx, void* data, char* buffer, size_t length);