diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-07-01 19:58:14 -0700 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-07-20 14:53:15 +0200 |
| commit | 9ce93478809de9a421b4a710c7c9de55ecf15187 (patch) | |
| tree | 99df250db648850094c7a9555805aaf8abaa2e01 | |
| parent | 7a1ab780c4de9eba20c6800a51b5cdeae1d19790 (diff) | |
core: normalize header inclusion in execute.h a bit
We don't actually need any functionality from cgroup.h in execute.h, hence
don't include that. However, we do need the Unit structure from unit.h, hence
include that, and move it as late as possible, since it needs the definitions
from execute.h.
| -rw-r--r-- | src/core/execute.h | 6 | ||||
| -rw-r--r-- | src/core/scope.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/core/execute.h b/src/core/execute.h index 73b8a119b0..189c4d0999 100644 --- a/src/core/execute.h +++ b/src/core/execute.h @@ -30,6 +30,7 @@ typedef struct ExecParameters ExecParameters; #include <stdio.h> #include <sys/capability.h> +#include "cgroup-util.h" #include "fdset.h" #include "list.h" #include "missing.h" @@ -203,9 +204,6 @@ struct ExecContext { bool no_new_privileges_set:1; }; -#include "cgroup-util.h" -#include "cgroup.h" - struct ExecParameters { char **argv; char **environment; @@ -236,6 +234,8 @@ struct ExecParameters { int stderr_fd; }; +#include "unit.h" + int exec_spawn(Unit *unit, ExecCommand *command, const ExecContext *context, diff --git a/src/core/scope.h b/src/core/scope.h index 2dc86325c5..713b8b9f02 100644 --- a/src/core/scope.h +++ b/src/core/scope.h @@ -21,7 +21,9 @@ typedef struct Scope Scope; +#include "cgroup.h" #include "kill.h" +#include "unit.h" typedef enum ScopeResult { SCOPE_SUCCESS, |