Prep v234.4: ake all supportable API functions visible (v234 addition).

diff --git a/src/libelogind/libelogind.sym b/src/libelogind/libelogind.sym
index dbd8a320b5044bb653b455ea6ffe876b21b4ee23..f7613e5e1c071c84d72b01ca08c6af5ff4dbb2da 100644 (file)
--- a/src/libelogind/libelogind.sym
+++ b/src/libelogind/libelogind.sym
@@ -71,7 +71,7 @@ global:
         sd_is_socket_inet;
         sd_is_socket_unix;
         sd_is_special;
-        /* sd_listen_fds; */
+        sd_listen_fds;
         sd_notify;
         sd_notifyf;
         sd_watchdog_enabled;
@@ -479,7 +479,7 @@ global:
         sd_bus_default_flush_close;
         sd_bus_path_decode_many;
         sd_bus_path_encode_many;
-        /* sd_listen_fds_with_names; */
+        sd_listen_fds_with_names;
 } LIBSYSTEMD_226;
 
 /*

diff --git a/src/libelogind/sd-daemon/sd-daemon.c b/src/libelogind/sd-daemon/sd-daemon.c
index 160bfa7c5d47c19811001e1165e3f2cf56d60a2d..47fc3a422fe9c480c7491d8e1f0e4d0b9387101a 100644 (file)
--- a/src/libelogind/sd-daemon/sd-daemon.c
+++ b/src/libelogind/sd-daemon/sd-daemon.c
@@ -44,7 +44,6 @@
 
 #define SNDBUF_SIZE (8*1024*1024)
 
-#if 0 /// UNNEEDED by elogind
 static void unsetenv_all(bool unset_environment) {
 
         if (!unset_environment)
@@ -145,7 +144,6 @@ _public_ int sd_listen_fds_with_names(int unset_environment, char ***names) {
 
         return n_fds;
 }
-#endif // 0
 
 _public_ int sd_is_fifo(int fd, const char *path) {
         struct stat st_fd;

diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h
index 1780746c7285b47a1517b2ff3f3da768af0e727c..cd9e30e9ee46767e8fec5be58f7ad2d2768fdca7 100644 (file)
--- a/src/systemd/sd-daemon.h
+++ b/src/systemd/sd-daemon.h
@@ -57,7 +57,6 @@ _SD_BEGIN_DECLARATIONS;
 /* The first passed file descriptor is fd 3 */
 #define SD_LISTEN_FDS_START 3
 
-#if 0 /// unsupported by elogind
 /*
   Returns how many file descriptors have been passed, or a negative
   errno code on failure. Optionally, removes the $LISTEN_FDS and
@@ -76,7 +75,6 @@ _SD_BEGIN_DECLARATIONS;
 int sd_listen_fds(int unset_environment);
 
 int sd_listen_fds_with_names(int unset_environment, char ***names);
-#endif // 0
 
 /*
   Helper call for identifying a passed file descriptor. Returns 1 if