Prep v238: Uncomment now needed headers and unmask now needed functions in src/core...

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 1b2235d04a396de27506b123a28c382962a33db4..dd173e2a310ed1d7abb484aeb8587b253a074cb7 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -38,7 +38,7 @@
 #include "stdio-util.h"
 #include "string-table.h"
 #include "string-util.h"
-//#include "virt.h"
+#include "virt.h"
 
 #define CGROUP_CPU_QUOTA_PERIOD_USEC ((usec_t) 100 * USEC_PER_MSEC)
 
@@ -56,6 +56,7 @@ bool manager_owns_root_cgroup(Manager *m) {
         return isempty(m->cgroup_root) || path_equal(m->cgroup_root, "/");
 }
 
+#if 0 /// UNNEEDED by elogind
 bool unit_has_root_cgroup(Unit *u) {
         assert(u);
 
@@ -68,7 +69,6 @@ bool unit_has_root_cgroup(Unit *u) {
         return unit_has_name(u, SPECIAL_ROOT_SLICE);
 }
 
-#if 0 /// UNNEEDED by elogind
 static void cgroup_compat_warn(void) {
         static bool cgroup_compat_warned = false;
 

diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 79898613b4fa3dc85aad5d2c7b34f6baf29a0a2a..29e8cb5e2d47bcfaafa7aaf942822172fa817c3f 100644 (file)
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -216,7 +216,10 @@ int unit_reset_ip_accounting(Unit *u);
 
 #endif // 0
 bool manager_owns_root_cgroup(Manager *m);
+
+#if 0 /// UNNEEDED by elogind
 bool unit_has_root_cgroup(Unit *u);
+#endif // 0
 
 int manager_notify_cgroup_empty(Manager *m, const char *group);