diff options
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_.patch | 16 |
1 files changed, 9 insertions, 7 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 1404895143..f43a22aa8b 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From 233de872b9b033ec842c2135152d2e006ac44c16 Mon Sep 17 00:00:00 2001 | 1 | From 9f0d5996bbb2db3679a4075fa8301750b786c03b Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 13:55:12 +0800 | 3 | Date: Mon, 25 Feb 2019 13:55:12 +0800 |
4 | Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t | 4 | Subject: [PATCH 03/26] missing_type.h: add __compare_fn_t and comparison_fn_t |
5 | 5 | ||
6 | Make it work with musl where comparison_fn_t and __compare_fn_t | 6 | Make it work with musl where comparison_fn_t and __compare_fn_t |
7 | is not provided. | 7 | is not provided. |
@@ -13,7 +13,6 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
14 | [Rebased for v242] | 14 | [Rebased for v242] |
15 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | 15 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
16 | |||
17 | --- | 16 | --- |
18 | src/basic/missing_type.h | 9 +++++++++ | 17 | src/basic/missing_type.h | 9 +++++++++ |
19 | src/basic/sort-util.h | 1 + | 18 | src/basic/sort-util.h | 1 + |
@@ -22,7 +21,7 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | |||
22 | 4 files changed, 12 insertions(+) | 21 | 4 files changed, 12 insertions(+) |
23 | 22 | ||
24 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | 23 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h |
25 | index bf8a6caa1b46..c487e65e7bde 100644 | 24 | index f6233090a9..aeaf6ad5ec 100644 |
26 | --- a/src/basic/missing_type.h | 25 | --- a/src/basic/missing_type.h |
27 | +++ b/src/basic/missing_type.h | 26 | +++ b/src/basic/missing_type.h |
28 | @@ -10,3 +10,12 @@ | 27 | @@ -10,3 +10,12 @@ |
@@ -39,7 +38,7 @@ index bf8a6caa1b46..c487e65e7bde 100644 | |||
39 | +typedef int (*__compar_fn_t)(const void *, const void *); | 38 | +typedef int (*__compar_fn_t)(const void *, const void *); |
40 | +#endif | 39 | +#endif |
41 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h | 40 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h |
42 | index 27d68b341cf3..307ea4ac0e8e 100644 | 41 | index 3394c9eb72..d9cb2aecb6 100644 |
43 | --- a/src/basic/sort-util.h | 42 | --- a/src/basic/sort-util.h |
44 | +++ b/src/basic/sort-util.h | 43 | +++ b/src/basic/sort-util.h |
45 | @@ -4,6 +4,7 @@ | 44 | @@ -4,6 +4,7 @@ |
@@ -51,7 +50,7 @@ index 27d68b341cf3..307ea4ac0e8e 100644 | |||
51 | void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, | 50 | void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, |
52 | __compar_d_fn_t compar, void *arg); | 51 | __compar_d_fn_t compar, void *arg); |
53 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | 52 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c |
54 | index 128674327362..09ccd613e32c 100644 | 53 | index 8a7f82812a..a56f12f47f 100644 |
55 | --- a/src/core/kmod-setup.c | 54 | --- a/src/core/kmod-setup.c |
56 | +++ b/src/core/kmod-setup.c | 55 | +++ b/src/core/kmod-setup.c |
57 | @@ -10,6 +10,7 @@ | 56 | @@ -10,6 +10,7 @@ |
@@ -63,7 +62,7 @@ index 128674327362..09ccd613e32c 100644 | |||
63 | #if HAVE_KMOD | 62 | #if HAVE_KMOD |
64 | #include "module-util.h" | 63 | #include "module-util.h" |
65 | diff --git a/src/journal/catalog.c b/src/journal/catalog.c | 64 | diff --git a/src/journal/catalog.c b/src/journal/catalog.c |
66 | index 70b2c8b46c4e..d574a64586f1 100644 | 65 | index 0f6ad8a29e..4e1077ade4 100644 |
67 | --- a/src/journal/catalog.c | 66 | --- a/src/journal/catalog.c |
68 | +++ b/src/journal/catalog.c | 67 | +++ b/src/journal/catalog.c |
69 | @@ -28,6 +28,7 @@ | 68 | @@ -28,6 +28,7 @@ |
@@ -74,3 +73,6 @@ index 70b2c8b46c4e..d574a64586f1 100644 | |||
74 | 73 | ||
75 | const char * const catalog_file_dirs[] = { | 74 | const char * const catalog_file_dirs[] = { |
76 | "/usr/local/lib/systemd/catalog/", | 75 | "/usr/local/lib/systemd/catalog/", |
76 | -- | ||
77 | 2.27.0 | ||
78 | |||