Prep v233.3: Unmask various functions for future coverage tests.

[elogind.git] / src / systemd / sd-event.h

diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h
index f46c3d3a15c4681cdb9aeaa842e3f9be10d7a4a0..020e7457460ee60a6b5829d23b2ddfb8285b9a95 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);
 
@@ -84,10 +91,8 @@ sd_event* sd_event_unref(sd_event *e);
 int sd_event_add_io(sd_event *e, sd_event_source **s, int fd, uint32_t events, sd_event_io_handler_t callback, void *userdata);
 int sd_event_add_time(sd_event *e, sd_event_source **s, clockid_t clock, uint64_t usec, uint64_t accuracy, sd_event_time_handler_t callback, void *userdata);
 int sd_event_add_signal(sd_event *e, sd_event_source **s, int sig, sd_event_signal_handler_t callback, void *userdata);
-#if 0 /// UNNEEDED by elogind
 int sd_event_add_child(sd_event *e, sd_event_source **s, pid_t pid, int options, sd_event_child_handler_t callback, void *userdata);
 int sd_event_add_defer(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata);
-#endif // 0
 int sd_event_add_post(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata);
 int sd_event_add_exit(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata);
 
@@ -95,14 +100,12 @@ int sd_event_prepare(sd_event *e);
 int sd_event_wait(sd_event *e, uint64_t usec);
 int sd_event_dispatch(sd_event *e);
 int sd_event_run(sd_event *e, uint64_t usec);
-#if 0 /// UNNEEDED by elogind
 int sd_event_loop(sd_event *e);
-#endif // 0
 int sd_event_exit(sd_event *e, int code);
 
-#if 0 /// UNNEEDED by elogind
 int sd_event_now(sd_event *e, clockid_t clock, uint64_t *usec);
 
+#if 0 /// UNNEEDED by elogind
 int sd_event_get_fd(sd_event *e);
 #endif // 0
 int sd_event_get_state(sd_event *e);
@@ -134,8 +137,8 @@ int sd_event_source_get_description(sd_event_source *s, const char **description
 int sd_event_source_set_prepare(sd_event_source *s, sd_event_handler_t callback);
 #if 0 /// UNNEEDED by elogind
 int sd_event_source_get_pending(sd_event_source *s);
-int sd_event_source_get_priority(sd_event_source *s, int64_t *priority);
 #endif // 0
+int sd_event_source_get_priority(sd_event_source *s, int64_t *priority);
 int sd_event_source_set_priority(sd_event_source *s, int64_t priority);
 #if 0 /// UNNEEDED by elogind
 int sd_event_source_get_enabled(sd_event_source *s, int *enabled);