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 2fe8173f442336004f8f725aeb200087dd523d63..3982974bad9638cfb2253003881cf9aa490f7617 100644 (file)
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -23,12 +23,10 @@
 
 #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 SystemdRunningAs {
@@ -38,9 +36,8 @@ typedef enum SystemdRunningAs {
         _SYSTEMD_RUNNING_AS_INVALID = -1
 } SystemdRunningAs;
 
-#define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free)
-
 int user_config_home(char **config_home);
+int user_runtime_dir(char **runtime_dir);
 
 int lookup_paths_init(LookupPaths *p,
                       SystemdRunningAs running_as,
@@ -50,3 +47,8 @@ int lookup_paths_init(LookupPaths *p,
                       const char *generator_early,
                       const char *generator_late);
 void lookup_paths_free(LookupPaths *p);
+int lookup_paths_init_from_scope(LookupPaths *paths,
+                                 UnitFileScope scope,
+                                 const char *root_dir);
+
+#define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free)