diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-05-18 10:25:59 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-18 10:25:59 +0900 |
| commit | c9f0f21e28bbbd90092315fcff31a1fef4f0937d (patch) | |
| tree | ccbf5799b1dabd037dee664d2ef29523b26770e1 /src | |
| parent | 8f02c9b0850152e2c0d09e53e9572a5c478f30c9 (diff) | |
| parent | 56e3c9581e2c9b7435d5fcbd74b47c7ccf6b3891 (diff) | |
| download | systemd-c9f0f21e28bbbd90092315fcff31a1fef4f0937d.tar.gz | |
Merge pull request #12593 from AdrianBunk/master
Small changes from Yocto/musl builds
Diffstat (limited to 'src')
| -rw-r--r-- | src/basic/fs-util.h | 1 | ||||
| -rw-r--r-- | src/basic/socket-util.h | 1 | ||||
| -rw-r--r-- | src/journal-remote/journal-remote-main.c | 4 | ||||
| -rw-r--r-- | src/shutdown/shutdown.c | 2 | ||||
| -rw-r--r-- | src/udev/udev-event.c | 1 |
5 files changed, 6 insertions, 3 deletions
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h index b9651205e6..c153bc4448 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -7,6 +7,7 @@ #include <stdbool.h> #include <stdint.h> #include <sys/inotify.h> +#include <sys/stat.h> #include <sys/types.h> #include <unistd.h> diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h index 6920fd99ba..36ec422f2c 100644 --- a/src/basic/socket-util.h +++ b/src/basic/socket-util.h @@ -9,6 +9,7 @@ #include <netinet/in.h> #include <stdbool.h> #include <stddef.h> +#include <string.h> #include <sys/socket.h> #include <sys/types.h> #include <sys/un.h> diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index 2321a91e7b..d32c51c3ce 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -528,7 +528,7 @@ static int dispatch_http_event(sd_event_source *event, void *userdata) { MHDDaemonWrapper *d = userdata; int r; - MHD_UNSIGNED_LONG_LONG timeout = ULONG_LONG_MAX; + MHD_UNSIGNED_LONG_LONG timeout = ULLONG_MAX; assert(d); @@ -538,7 +538,7 @@ static int dispatch_http_event(sd_event_source *event, return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "MHD_run failed!"); if (MHD_get_timeout(d->daemon, &timeout) == MHD_NO) - timeout = ULONG_LONG_MAX; + timeout = ULLONG_MAX; r = sd_event_source_set_time(d->timer_event, timeout); if (r < 0) { diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c index 35b2c2aa46..9623fe9ea2 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c @@ -212,7 +212,7 @@ static int sync_making_progress(unsigned long long *prev_dirty) { } static void sync_with_progress(void) { - unsigned long long dirty = ULONG_LONG_MAX; + unsigned long long dirty = ULLONG_MAX; unsigned checks; pid_t pid; int r; diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index cab1b5ac0c..a0a7ac0f9e 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -7,6 +7,7 @@ #include <stddef.h> #include <stdio.h> #include <stdlib.h> +#include <sys/wait.h> #include <unistd.h> #include "sd-event.h" |