X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-lookup.h;h=3982974bad9638cfb2253003881cf9aa490f7617;hb=30ab6a0fc1bb950c4dcd90dcd3dfe00a810c7fc1;hp=e35c8d3c046a83dd892a977afa1a286fe5a12bdc;hpb=15658a4bc930a9b4b9511256431c2e2383dad0f5;p=elogind.git

diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h
index e35c8d3c0..3982974ba 100644
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -23,39 +23,32 @@
 
 #include "macro.h"
 
+typedef enum UnitFileScope UnitFileScope;
+
 typedef struct LookupPaths {
         char **unit_path;
-#ifdef HAVE_SYSV_COMPAT
-        char **sysvinit_path;
-        char **sysvrcnd_path;
-#endif
 } 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)