X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind.h;fp=src%2Flogin%2Flogind.h;h=53c2b38840d21a53d3e5d32df61a6986fb09a6af;hb=8331cb6e143dc261fd22af9a2a679196822326a9;hp=752d4e399e86b2d3522f5a4174ffee28fb9160c0;hpb=2e95ec430d1d295404c517aee832ab5097f36e1c;p=elogind.git

diff --git a/src/login/logind.h b/src/login/logind.h
index 752d4e399..53c2b3884 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -21,14 +21,17 @@
 
 #include <stdbool.h>
 
+#if 0 /// elogind needs the systems udev header
 #include "libudev.h"
+#else
+#include <libudev.h>
+#endif // 0
 #include "sd-bus.h"
 #include "sd-event.h"
 
 #include "cgroup-util.h"
 #include "hashmap.h"
 #include "list.h"
-#include "path-lookup.h"
 #include "set.h"
 
 typedef struct Manager Manager;
@@ -63,12 +66,19 @@ struct Manager {
         sd_event_source *udev_vcsa_event_source;
         sd_event_source *udev_button_event_source;
 
+#if 0 /// elogind does not support autospawning of vts
+        int console_active_fd;
+
+        unsigned n_autovts;
+
+        unsigned reserve_vt;
+        int reserve_vt_fd;
+#else
         /* Make sure the user cannot accidentally unmount our cgroup
          * file system */
         int pin_cgroupfs_fd;
 
         /* Flags */
-        ManagerRunningAs running_as;
         bool test_run:1;
 
         /* Data specific to the cgroup subsystem */
@@ -76,12 +86,6 @@ struct Manager {
         char *cgroup_root;
 
         int console_active_fd;
-
-#if 0 /// elogind does not support autospawning of vts
-        unsigned n_autovts;
-
-        unsigned reserve_vt;
-        int reserve_vt_fd;
 #endif // 0
 
         Seat *seat0;
@@ -115,8 +119,12 @@ struct Manager {
            contains the action we are supposed to perform after the
            delay is over */
         HandleAction pending_action;
-#endif // 0
 
+        char **suspend_state,      **suspend_mode;
+        char **hibernate_state,    **hibernate_mode;
+        char **hybrid_sleep_state, **hybrid_sleep_mode;
+
+#endif // 0
         sd_event_source *inhibit_timeout_source;
 
         char *scheduled_shutdown_type;
@@ -151,10 +159,6 @@ struct Manager {
 
         bool remove_ipc;
 
-        char **suspend_state,      **suspend_mode;
-        char **hibernate_state,    **hibernate_mode;
-        char **hybrid_sleep_state, **hybrid_sleep_mode;
-
         Hashmap *polkit_registry;
 
         usec_t holdoff_timeout_usec;
@@ -210,7 +214,7 @@ int manager_send_changed(Manager *manager, const char *property, ...) _sentinel_
 
 #if 0 /// UNNEEDED by elogind
 int manager_start_slice(Manager *manager, const char *slice, const char *description, const char *after, const char *after2, uint64_t tasks_max, sd_bus_error *error, char **job);
-int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *after2, sd_bus_error *error, char **job);
+int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *after2, uint64_t tasks_max, sd_bus_error *error, char **job);
 int manager_start_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job);
 int manager_stop_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job);
 int manager_abandon_scope(Manager *manager, const char *scope, sd_bus_error *error);