From 91d60274701a12d2bbcd2b8e40f8b8abe00be0e7 Mon Sep 17 00:00:00 2001 From: Matija Skala Date: Wed, 15 Mar 2017 14:16:40 +0100 Subject: [PATCH] check for _POSIX_C_SOURCE instead of __USE_POSIX* check for _GNU_SOURCE as well as sd_event_child_handler_t needs to be defined correctly while compiling elogind --- src/systemd/sd-event.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h index 020e74574..95d9f37c2 100644 --- a/src/systemd/sd-event.h +++ b/src/systemd/sd-event.h @@ -69,18 +69,11 @@ 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) ) ) +#if defined _GNU_SOURCE || _POSIX_C_SOURCE >= 199309L 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); -- 2.30.2