Prep v234: Apply missing upstream fixes in src/systemd (5/6)

diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 009cffea92822e8f71674aff638766a7b5c2f1f3..ca44a441223a13cbf74fc49da9509361f06ae3ad 100644 (file)
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -306,6 +306,7 @@ int sd_bus_message_set_priority(sd_bus_message *m, int64_t priority);
 #endif // 0
 
 int sd_bus_message_append(sd_bus_message *m, const char *types, ...);
 #endif // 0
 
 int sd_bus_message_append(sd_bus_message *m, const char *types, ...);

+int sd_bus_message_appendv(sd_bus_message *m, const char *types, va_list ap);

 int sd_bus_message_append_basic(sd_bus_message *m, char type, const void *p);
 #if 0 /// UNNEEDED by elogind
 int sd_bus_message_append_array(sd_bus_message *m, char type, const void *ptr, size_t size);
 int sd_bus_message_append_basic(sd_bus_message *m, char type, const void *p);
 #if 0 /// UNNEEDED by elogind
 int sd_bus_message_append_array(sd_bus_message *m, char type, const void *ptr, size_t size);

diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h
index ac31df94b46df62c16a2103c6991167e8bb1a821..83a8fe82fa4a281a17623e7d6f5d22b8da015a25 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
 
 /* The first passed file descriptor is fd 3 */
 #define SD_LISTEN_FDS_START 3
 

-#if 0 /// UNNEEDED by elogind

 /*
   Returns how many file descriptors have been passed, or a negative
   errno code on failure. Optionally, removes the $LISTEN_FDS and
 /*
   Returns how many file descriptors have been passed, or a negative
   errno code on failure. Optionally, removes the $LISTEN_FDS and


@@ -77,6 +76,7 @@ int sd_listen_fds(int unset_environment);
 
 int sd_listen_fds_with_names(int unset_environment, char ***names);
 
 
 int sd_listen_fds_with_names(int unset_environment, char ***names);
 

+#if 0 /// UNNEEDED by elogind

 /*
   Helper call for identifying a passed file descriptor. Returns 1 if
   the file descriptor is a FIFO in the file system stored under the
 /*
   Helper call for identifying a passed file descriptor. Returns 1 if
   the file descriptor is a FIFO in the file system stored under the