Prep v231: Apply missing fixes from upstream (6/6) src/systemd

diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h
index bb7f34e32d2785b9288766fb565ec0fed3b7fd8f..305b4d604afa85665e1423b86ccde4f3c48fa170 100644 (file)
--- a/src/systemd/sd-daemon.h
+++ b/src/systemd/sd-daemon.h
@@ -200,6 +200,11 @@ int sd_is_mq(int fd, const char *path);
                   invocation. This variable is only supported with
                   sd_pid_notify_with_fds().
 
+     WATCHDOG_USEC=...
+                  Reset watchdog_usec value during runtime.
+                  To reset watchdog_usec value, start the service again.
+                  Example: "WATCHDOG_USEC=20000000"
+
   Daemons can choose to send additional variables. However, it is
   recommended to prefix variable names not listed above with X_.
 

diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h
index 0b61bfa47208d2116d2278c26175139e9ba7dcab..f46c3d3a15c4681cdb9aeaa842e3f9be10d7a4a0 100644 (file)
--- a/src/systemd/sd-event.h
+++ b/src/systemd/sd-event.h
@@ -113,7 +113,10 @@ int sd_event_get_exit_code(sd_event *e, int *code);
 int sd_event_set_watchdog(sd_event *e, int b);
 #if 0 /// UNNEEDED by elogind
 int sd_event_get_watchdog(sd_event *e);
+#endif // 0
+int sd_event_get_iteration(sd_event *e, uint64_t *ret);
 
+#if 0 /// UNNEEDED by elogind
 sd_event_source* sd_event_source_ref(sd_event_source *s);
 #endif // 0
 sd_event_source* sd_event_source_unref(sd_event_source *s);