summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-18 09:51:24 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-21 12:56:33 +0100
commit3b06404e30e1f163175002ec95ec39b9e7a21e00 (patch)
tree0f4ba2f95f2b7478acfc537704d5d10345deaa45 /meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
parentca3de9df8affe61bcb5b8d17139f1faa8d018c77 (diff)
downloadpoky-3b06404e30e1f163175002ec95ec39b9e7a21e00.tar.gz
systemd: Some upstreamable musl patches have been upstreamed
(From OE-Core rev: 71f99af0d05656a4546e691f6b6e876776c22b13) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch b/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
new file mode 100644
index 0000000000..6f192a2ad2
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
@@ -0,0 +1,50 @@
1From f491dfdc88ddbba36a24a75b2063aff027461b83 Mon Sep 17 00:00:00 2001
2From: Adrian Bunk <bunk@stusta.de>
3Date: Thu, 16 May 2019 22:20:07 +0300
4Subject: Replace the legacy ULONG_LONG_MAX with the C99 ULLONG_MAX
5
6Upstream-Status: Backport
7Signed-off-by: Adrian Bunk <bunk@stusta.de>
8---
9 src/journal-remote/journal-remote-main.c | 4 ++--
10 src/shutdown/shutdown.c | 2 +-
11 2 files changed, 3 insertions(+), 3 deletions(-)
12
13diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
14index 2321a91e7b..d32c51c3ce 100644
15--- a/src/journal-remote/journal-remote-main.c
16+++ b/src/journal-remote/journal-remote-main.c
17@@ -528,7 +528,7 @@ static int dispatch_http_event(sd_event_source *event,
18 void *userdata) {
19 MHDDaemonWrapper *d = userdata;
20 int r;
21- MHD_UNSIGNED_LONG_LONG timeout = ULONG_LONG_MAX;
22+ MHD_UNSIGNED_LONG_LONG timeout = ULLONG_MAX;
23
24 assert(d);
25
26@@ -538,7 +538,7 @@ static int dispatch_http_event(sd_event_source *event,
27 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
28 "MHD_run failed!");
29 if (MHD_get_timeout(d->daemon, &timeout) == MHD_NO)
30- timeout = ULONG_LONG_MAX;
31+ timeout = ULLONG_MAX;
32
33 r = sd_event_source_set_time(d->timer_event, timeout);
34 if (r < 0) {
35diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
36index 35b2c2aa46..9623fe9ea2 100644
37--- a/src/shutdown/shutdown.c
38+++ b/src/shutdown/shutdown.c
39@@ -212,7 +212,7 @@ static int sync_making_progress(unsigned long long *prev_dirty) {
40 }
41
42 static void sync_with_progress(void) {
43- unsigned long long dirty = ULONG_LONG_MAX;
44+ unsigned long long dirty = ULLONG_MAX;
45 unsigned checks;
46 pid_t pid;
47 int r;
48--
492.20.1
50