summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2019-04-18 12:19:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-26 10:09:08 +0100
commitc814947e03943c305226f17686f34b0c62450680 (patch)
treef0000576030b9d1d3d0b3f61e57da3daf7f579cf /meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
parent018be19fbf50dc5d9be9aa1dad5f33023cec1595 (diff)
downloadpoky-c814947e03943c305226f17686f34b0c62450680.tar.gz
systemd: upgrade to 242
PATCH REBASED: ============== 0001-do-not-disable-buffer-in-writing-files.patch 0002-don-t-use-glibc-specific-qsort_r.patch 0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch 0004-add-fallback-parse_printf_format-implementation.patch 0005-rules-watch-metadata-changes-in-ide-devices.patch 0005-src-basic-missing.h-check-for-missing-strndupa.patch 0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch 0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch 0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch 0021-avoid-redefinition-of-prctl_mm_map-structure.patch 0024-test-json.c-define-M_PIl.patch PATCH DROPPED: ============== 0001-meson-declare-version.h-as-dep-for-various-targets-t.patch 0001-meson-declare-version.h-as-dependency-for-systemd.patch 0013-test-hexdecoct.c-Include-missing.h-for-strndupa.patch PATCH ADDED: 0025-fs-utilh-add-missing-sys-stat-include.patch (From OE-Core rev: 1d453c9087f92da1ceddc66a887941e4929b3448) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch32
1 files changed, 17 insertions, 15 deletions
diff --git a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
index 5246b4b26c..2e39f7a2e1 100644
--- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
+++ b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
@@ -9,14 +9,16 @@ is not provided.
9Upstream-Status: Inappropriate [musl specific] 9Upstream-Status: Inappropriate [musl specific]
10 10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12[Rebased for v242]
13Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
12--- 14---
13 src/basic/missing_type.h | 9 +++++++++ 15 src/basic/missing_type.h | 9 +++++++++
14 src/basic/util.h | 1 + 16 src/basic/sort-util.h | 1 +
15 src/journal/catalog.c | 1 + 17 src/journal/catalog.c | 1 +
16 3 files changed, 11 insertions(+) 18 3 files changed, 11 insertions(+)
17 19
18diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h 20diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
19index bf8a6ca..c487e65 100644 21index bf8a6caa1b..2134fe5095 100644
20--- a/src/basic/missing_type.h 22--- a/src/basic/missing_type.h
21+++ b/src/basic/missing_type.h 23+++ b/src/basic/missing_type.h
22@@ -10,3 +10,12 @@ 24@@ -10,3 +10,12 @@
@@ -32,30 +34,30 @@ index bf8a6ca..c487e65 100644
32+#define __COMPAR_FN_T 34+#define __COMPAR_FN_T
33+typedef int (*__compar_fn_t)(const void *, const void *); 35+typedef int (*__compar_fn_t)(const void *, const void *);
34+#endif 36+#endif
35diff --git a/src/basic/util.h b/src/basic/util.h 37diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
36index 9f6a6ce..2c5dc32 100644 38index e029f86..7247d40 100644
37--- a/src/basic/util.h 39--- a/src/basic/sort-util.h
38+++ b/src/basic/util.h 40+++ b/src/basic/sort-util.h
39@@ -26,6 +26,7 @@ 41@@ -4,6 +4,7 @@
40 #include "format-util.h" 42 #include <stdlib.h>
43
41 #include "macro.h" 44 #include "macro.h"
42 #include "time-util.h"
43+#include "missing.h" 45+#include "missing.h"
44 46
45 size_t page_size(void) _pure_; 47 void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
46 #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) 48 __compar_d_fn_t compar, void *arg);
47diff --git a/src/journal/catalog.c b/src/journal/catalog.c 49diff --git a/src/journal/catalog.c b/src/journal/catalog.c
48index 4062f12..034e00c 100644 50index 7beffc1e1a..4818a2e5cc 100644
49--- a/src/journal/catalog.c 51--- a/src/journal/catalog.c
50+++ b/src/journal/catalog.c 52+++ b/src/journal/catalog.c
51@@ -26,6 +26,7 @@ 53@@ -29,6 +29,7 @@
54 #include "string-util.h"
52 #include "strv.h" 55 #include "strv.h"
53 #include "tmpfile-util.h" 56 #include "tmpfile-util.h"
54 #include "util.h"
55+#include "missing.h" 57+#include "missing.h"
56 58
57 const char * const catalog_file_dirs[] = { 59 const char * const catalog_file_dirs[] = {
58 "/usr/local/lib/systemd/catalog/", 60 "/usr/local/lib/systemd/catalog/",
59-- 61--
602.7.4 622.11.0
61 63