From: Sven Eden <yamakuzure@gmx.net>
Date: Tue, 12 Dec 2017 17:18:28 +0000 (+0100)
Subject:  Prep v237.3: Make all supportable API functions visible
X-Git-Tag: v235.1~20
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=51af30cfe8205f5cc553d1f42fec6a84475568b2;p=elogind.git

 Prep v237.3: Make all supportable API functions visible
(v233 addition).
---

diff --git a/src/basic/missing.h b/src/basic/missing.h
index 7768b07e8..63eacbb17 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -55,7 +55,6 @@
 #include <linux/btrfs.h>
 #endif
 
-#if 0 /// UNNEEDED by elogind
 #if HAVE_LINUX_VM_SOCKETS_H
 #include <linux/vm_sockets.h>
 #else
@@ -72,7 +71,6 @@ struct sockaddr_vm {
                                sizeof(unsigned int)];
 };
 #endif /* !HAVE_LINUX_VM_SOCKETS_H */
-#endif // 0
 
 #ifndef RLIMIT_RTTIME
 #define RLIMIT_RTTIME 15
diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h
index 91aa2f529..d4f573efb 100644
--- a/src/basic/socket-util.h
+++ b/src/basic/socket-util.h
@@ -39,7 +39,7 @@ union sockaddr_union {
         struct sockaddr_in in;
         struct sockaddr_in6 in6;
         struct sockaddr_un un;
-#if 0 /// UNNEEDED by elogind.
+#if 0 /// UNNEEDED by elogind, only 'sa', 'in', 'in6' and 'un' are used in all of elogind.
         struct sockaddr_nl nl;
         struct sockaddr_storage storage;
         struct sockaddr_ll ll;
diff --git a/src/libelogind/sd-daemon/sd-daemon.c b/src/libelogind/sd-daemon/sd-daemon.c
index 755ba7501..719deb760 100644
--- a/src/libelogind/sd-daemon/sd-daemon.c
+++ b/src/libelogind/sd-daemon/sd-daemon.c
@@ -633,8 +633,11 @@ _public_ int sd_booted(void) {
         /* We test whether the runtime unit file directory has been
          * created. This takes place in mount-setup.c, so is
          * guaranteed to happen very early during boot. */
-
+#if 0 /// elogind is always used without systemd running the show. (Well, it should...)
         return laccess("/run/systemd/system/", F_OK) >= 0;
+#else
+        return 0;
+#endif // 0
 }
 
 _public_ int sd_watchdog_enabled(int unset_environment, uint64_t *usec) {