shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-23 10:50:16 +03:00
Code

Merge pull request #12593 from AdrianBunk/master

Browse Source 
Small changes from Yocto/musl builds
This commit is contained in:
Yu Watanabe 2019-05-18 10:25:59 +09:00 committed by GitHub
commit c9f0f21e28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/basic/fs-util.h
View File

@ -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>

1
src/basic/socket-util.h
View File

@ -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>

4
src/journal-remote/journal-remote-main.c
View File

@ -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) {

2
src/shutdown/shutdown.c
View File

@ -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;

1
src/udev/udev-event.c
View File

@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/wait.h>
#include <unistd.h>
#include "sd-event.h"