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 | 32 |
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. | |||
9 | Upstream-Status: Inappropriate [musl specific] | 9 | Upstream-Status: Inappropriate [musl specific] |
10 | 10 | ||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
12 | [Rebased for v242] | ||
13 | Signed-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 | ||
18 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | 20 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h |
19 | index bf8a6ca..c487e65 100644 | 21 | index 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 |
35 | diff --git a/src/basic/util.h b/src/basic/util.h | 37 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h |
36 | index 9f6a6ce..2c5dc32 100644 | 38 | index 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); |
47 | diff --git a/src/journal/catalog.c b/src/journal/catalog.c | 49 | diff --git a/src/journal/catalog.c b/src/journal/catalog.c |
48 | index 4062f12..034e00c 100644 | 50 | index 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 | -- |
60 | 2.7.4 | 62 | 2.11.0 |
61 | 63 | ||