X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemd%2Fsd-event.h;h=d17c68d51bc47a4d470aef22e79b172e16949b4c;hb=3e6d9bb47a4f0f7b717de2691b1b962f65851869;hp=fd32ac85650b9ebae99a39674e2a149e0b921fba;hpb=51e8372fb6cca277dc7afc6e83f48a1a2b6d4dbe;p=elogind.git

diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h
index fd32ac856..d17c68d51 100644
--- a/src/systemd/sd-event.h
+++ b/src/systemd/sd-event.h
@@ -55,7 +55,7 @@ enum {
         SD_EVENT_RUNNING,
         SD_EVENT_EXITING,
         SD_EVENT_FINISHED,
-        SD_EVENT_PREPARING,
+        SD_EVENT_PREPARING
 };
 
 enum {
@@ -69,7 +69,18 @@ typedef int (*sd_event_handler_t)(sd_event_source *s, void *userdata);
 typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata);
 typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata);
 typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata);
+#if 1 /// elogind is musl-libc compatible, which has other guards for siginfo_t
+#if ( defined(__GLIBC__) \
+   && ( defined(__USE_POSIX199309) || defined(__USE_XOPEN_EXTENDED) ) ) \
+ || (!defined(__GLIBC__) \
+   && ( defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+     || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+     || defined(_BSD_SOURCE) ) )
 typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata);
+#else
+typedef void* sd_event_child_handler_t;
+#endif
+#endif // 1
 
 int sd_event_default(sd_event **e);
 
@@ -109,7 +120,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);