summaryrefslogtreecommitdiff
path: root/src/systemd
diff options
context:
space:
mode:
authorSven Eden <yamakuzure@gmx.net>2017-06-19 11:51:42 +0200
committerSven Eden <yamakuzure@gmx.net>2017-06-19 11:51:42 +0200
commit1860162c2f28965fa11781fc120e6a542002eace (patch)
treeb6d990fc14feea4f7fe187746439a11dd6ee1d93 /src/systemd
parent679af4b64de23aec2e8567e7274c86d6895afbc7 (diff)
Prep v231.2: Make elogind musl-libc-compatible again.
Diffstat (limited to 'src/systemd')
-rw-r--r--src/systemd/sd-event.h9
1 files changed, 8 insertions, 1 deletions
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);