X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemd%2Fsd-event.h;h=d17c68d51bc47a4d470aef22e79b172e16949b4c;hb=a1002c6e2e7933c03aa4f49bdbce31e246ab589d;hp=0b61bfa47208d2116d2278c26175139e9ba7dcab;hpb=cadc392ed7e51a99235c69a8006eeba208317ebe;p=elogind.git diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h index 0b61bfa47..d17c68d51 100644 --- a/src/systemd/sd-event.h +++ b/src/systemd/sd-event.h @@ -69,11 +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 defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED +#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); @@ -113,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);