diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-06-19 11:51:42 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-06-19 11:51:42 +0200 |
| commit | 1860162c2f28965fa11781fc120e6a542002eace (patch) | |
| tree | b6d990fc14feea4f7fe187746439a11dd6ee1d93 | |
| parent | 679af4b64de23aec2e8567e7274c86d6895afbc7 (diff) | |
Prep v231.2: Make elogind musl-libc-compatible again.
| -rw-r--r-- | src/basic/parse-util.c | 3 | ||||
| -rw-r--r-- | src/shared/pager.c | 5 | ||||
| -rw-r--r-- | src/systemd/sd-event.h | 9 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c index 90bae7149..77e85f658 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c @@ -33,6 +33,9 @@ #include "parse-util.h" #include "string-util.h" +/// Additional includes needed by elogind +#include "musl_missing.h" + int parse_boolean(const char *v) { assert(v); diff --git a/src/shared/pager.c b/src/shared/pager.c index 1fdf8ed68..bb3e17fee 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c @@ -158,8 +158,13 @@ void pager_close(void) { return; /* Inform pager that we are done */ +#ifdef __GLIBC__ stdout = safe_fclose(stdout); stderr = safe_fclose(stderr); +#else + safe_fclose(stdout); + safe_fclose(stderr); +#endif // __GLIBC__ (void) kill(pager_pid, SIGCONT); (void) wait_for_terminate(pager_pid, NULL); 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); |