From 284d1cd0a12cad96a5ea61d1afb0dd677dbd147e Mon Sep 17 00:00:00 2001 From: Matija Skala Date: Wed, 15 Mar 2017 13:21:10 +0100 Subject: fix includes linux/sockios.h is needed for the SIOCGSTAMPNS macro xlocale.h is included indirectly in glibc and doesn't even exist in other libcs --- src/basic/parse-util.c | 1 - src/libsystemd-network/sd-lldp.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c index 6e58ced6f5..d86700736d 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "alloc-util.h" #include "extract-word.h" diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c index 0702241506..39ddb2461a 100644 --- a/src/libsystemd-network/sd-lldp.c +++ b/src/libsystemd-network/sd-lldp.c @@ -19,6 +19,7 @@ ***/ #include +#include #include "sd-lldp.h" -- cgit v1.2.3-54-g00ecf From e5276995aeb0ccbad4a86c81312fe9ce6ba13e66 Mon Sep 17 00:00:00 2001 From: Matija Skala Date: Wed, 15 Mar 2017 13:49:05 +0100 Subject: assigning stdout and stderr is not allowed --- src/shared/pager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/shared/pager.c b/src/shared/pager.c index f00ba9e1e7..c1480a718b 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c @@ -161,8 +161,8 @@ void pager_close(void) { return; /* Inform pager that we are done */ - stdout = safe_fclose(stdout); - stderr = safe_fclose(stderr); + safe_fclose(stdout); + safe_fclose(stderr); (void) kill(pager_pid, SIGCONT); (void) wait_for_terminate(pager_pid, NULL); -- cgit v1.2.3-54-g00ecf From 2797366cd23190595891b4b55f87951d3ee2ba4b Mon Sep 17 00:00:00 2001 From: Matija Skala Date: Wed, 15 Mar 2017 14:16:40 +0100 Subject: 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 systemd --- src/systemd/sd-event.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h index cc26b7df55..f8cb895660 100644 --- a/src/systemd/sd-event.h +++ b/src/systemd/sd-event.h @@ -69,7 +69,7 @@ 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 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; -- cgit v1.2.3-54-g00ecf