diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-03-16 08:42:22 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-03-16 08:42:22 -0400 |
| commit | 825fd3cd41d4160ceef7ee35ce57723594d877ab (patch) | |
| tree | 40195f99d3ef653e6692961b187d3a14ab1fc4fb | |
| parent | d1d59eeb4720371d255fcee025e9e7d96bd625d1 (diff) | |
| parent | 2797366cd23190595891b4b55f87951d3ee2ba4b (diff) | |
Merge (¾ of) pull request #5596 from matijaskala/master
| -rw-r--r-- | src/basic/parse-util.c | 1 | ||||
| -rw-r--r-- | src/libsystemd-network/sd-lldp.c | 1 | ||||
| -rw-r--r-- | src/shared/pager.c | 4 | ||||
| -rw-r--r-- | src/systemd/sd-event.h | 2 |
4 files changed, 4 insertions, 4 deletions
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 <stdio.h> #include <stdlib.h> #include <string.h> -#include <xlocale.h> #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 <arpa/inet.h> +#include <linux/sockios.h> #include "sd-lldp.h" 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); 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; |