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

diff --git a/src/libelogind/sd-bus/bus-control.c b/src/libelogind/sd-bus/bus-control.c
index 09b934e7f5beccdfb331b4b467f64dc8644285ce..9dd5274bf60339dd412aa4fb5fc85ad1e9eaafb9 100644 (file)
--- a/src/libelogind/sd-bus/bus-control.c
+++ b/src/libelogind/sd-bus/bus-control.c
@@ -33,7 +33,7 @@
 #include "bus-message.h"
 #include "bus-util.h"
 #include "capability-util.h"
-//#include "process-util.h"
+#include "process-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "strv.h"

diff --git a/src/libelogind/sd-bus/bus-gvariant.c b/src/libelogind/sd-bus/bus-gvariant.c
index 8730a924cd4a0e174339156bbe77ed3c71ca01cb..e6ab984d1f33ce9506097ed22f654b91d9bacf44 100644 (file)
--- a/src/libelogind/sd-bus/bus-gvariant.c
+++ b/src/libelogind/sd-bus/bus-gvariant.c
@@ -18,10 +18,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-//#include <errno.h>
-//#include <string.h>
+#include <errno.h>
+#include <string.h>
 
-//#include "sd-bus.h"
+#include "sd-bus.h"
 
 #include "bus-gvariant.h"
 #include "bus-signature.h"

diff --git a/src/libelogind/sd-bus/bus-signature.c b/src/libelogind/sd-bus/bus-signature.c
index ba9708c7bb2239b9c56e8a92b39d59b1696bf6d8..f3cd9bd0fa2daf788aaecfae48a865efb38fdaae 100644 (file)
--- a/src/libelogind/sd-bus/bus-signature.c
+++ b/src/libelogind/sd-bus/bus-signature.c
@@ -20,7 +20,7 @@
 
 #include <util.h>
 
-//#include "sd-bus.h"
+#include "sd-bus.h"
 
 #include "bus-signature.h"
 #include "bus-type.h"

diff --git a/src/libelogind/sd-bus/bus-socket.c b/src/libelogind/sd-bus/bus-socket.c
index bb0e612b95c8eed0d08aeb2ca5b32bdc9731e8d6..b5160cff6a82fa63240dd6a13474b9285ad4f401 100644 (file)
--- a/src/libelogind/sd-bus/bus-socket.c
+++ b/src/libelogind/sd-bus/bus-socket.c
@@ -32,13 +32,13 @@
 #include "bus-socket.h"
 #include "fd-util.h"
 #include "format-util.h"
-//#include "fs-util.h"
+#include "fs-util.h"
 #include "hexdecoct.h"
-//#include "io-util.h"
+#include "io-util.h"
 #include "macro.h"
 #include "missing.h"
-//#include "path-util.h"
-//#include "process-util.h"
+#include "path-util.h"
+#include "process-util.h"
 #include "selinux-util.h"
 #include "signal-util.h"
 #include "stdio-util.h"

diff --git a/src/libelogind/sd-bus/bus-type.c b/src/libelogind/sd-bus/bus-type.c
index c580faaf91679668fa20c986e2d963699f83d7bd..8a7b522c35d852e7a0b49ebe70ddb38306c5254c 100644 (file)
--- a/src/libelogind/sd-bus/bus-type.c
+++ b/src/libelogind/sd-bus/bus-type.c
@@ -18,9 +18,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-//#include <errno.h>
+#include <errno.h>
 
-//#include "sd-bus.h"
+#include "sd-bus.h"
 
 #include "bus-type.h"
 

diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c
index c42af08dd6306ecb4effa61ff7444687324fddd4..eb415e6e30fa4c1f134f6a35a862cc1bdc648ac0 100644 (file)
--- a/src/libelogind/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
@@ -82,9 +82,7 @@ static void bus_detach_io_events(sd_bus *b);
 static void bus_detach_inotify_event(sd_bus *b);
 
 static thread_local sd_bus *default_system_bus = NULL;
-#if 0 /// UNNEEDED by elogind
 static thread_local sd_bus *default_user_bus = NULL;
-#endif // 0
 static thread_local sd_bus *default_starter_bus = NULL;
 
 static sd_bus **bus_choose_default(int (**bus_open)(sd_bus **)) {
@@ -3700,11 +3698,6 @@ _public_ int sd_bus_default(sd_bus **ret) {
         int (*bus_open)(sd_bus **) = NULL;
         sd_bus **busp;
 
-#if 0 /// elogind does not support systemd units
-#endif // 0
-
-#if 0 /// elogind does not support systemd user instances
-#endif // 0
         busp = bus_choose_default(&bus_open);
         return bus_default(bus_open, busp, ret);
 }

diff --git a/src/libelogind/sd-id128/id128-util.c b/src/libelogind/sd-id128/id128-util.c
index 95cda29436f076e3b36006d34e920d99095bac46..330cd0b01400cd83bd1b448b1b94a9670d134ed2 100644 (file)
--- a/src/libelogind/sd-id128/id128-util.c
+++ b/src/libelogind/sd-id128/id128-util.c
@@ -18,12 +18,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-//#include <errno.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include "fd-util.h"
-//#include "fs-util.h"
+#include "fs-util.h"
 #include "hexdecoct.h"
 #include "id128-util.h"
 #include "io-util.h"