From 1860162c2f28965fa11781fc120e6a542002eace Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Mon, 19 Jun 2017 11:51:42 +0200 Subject: Prep v231.2: Make elogind musl-libc-compatible again. --- src/systemd/sd-event.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/systemd') diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h index f46c3d3a1..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); -- cgit v1.2.3