Prep v231.2: Make elogind musl-libc-compatible again.

diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index 90bae7149559ee6001bf25b69341fd1da765b583..77e85f658a9a23f16cb63e72496739631076d7aa 100644 (file)
--- 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 1fdf8ed689bb821475d0731575a853241b92003c..bb3e17fee2af206041162b7f0297c9cde520a461 100644 (file)
--- 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 f46c3d3a15c4681cdb9aeaa842e3f9be10d7a4a0..d17c68d51bc47a4d470aef22e79b172e16949b4c 100644 (file)
--- 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);