Prep v221: Update and clean up build system to sync with upstream

[elogind.git] / src / shared / path-lookup.h

diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h
index f4f9895bb4256ea787ac99643afba1f95a54e259..3982974bad9638cfb2253003881cf9aa490f7617 100644 (file)
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -23,35 +23,32 @@
 
 #include "macro.h"
 
+typedef enum UnitFileScope UnitFileScope;
+
 typedef struct LookupPaths {
         char **unit_path;
 } LookupPaths;
 
-typedef enum ManagerRunningAs {
-        MANAGER_SYSTEM,
-        MANAGER_USER,
-        _MANAGER_RUNNING_AS_MAX,
-        _MANAGER_RUNNING_AS_INVALID = -1
-} ManagerRunningAs;
+typedef enum SystemdRunningAs {
+        SYSTEMD_SYSTEM,
+        SYSTEMD_USER,
+        _SYSTEMD_RUNNING_AS_MAX,
+        _SYSTEMD_RUNNING_AS_INVALID = -1
+} SystemdRunningAs;
 
 int user_config_home(char **config_home);
 int user_runtime_dir(char **runtime_dir);
 
-char **generator_paths(ManagerRunningAs running_as);
-
 int lookup_paths_init(LookupPaths *p,
-                      ManagerRunningAs running_as,
+                      SystemdRunningAs running_as,
                       bool personal,
                       const char *root_dir,
                       const char *generator,
                       const char *generator_early,
                       const char *generator_late);
-
-#include "install.h"
-
+void lookup_paths_free(LookupPaths *p);
 int lookup_paths_init_from_scope(LookupPaths *paths,
                                  UnitFileScope scope,
                                  const char *root_dir);
 
-void lookup_paths_free(LookupPaths *p);
 #define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free)