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 | 61 |
1 files changed, 61 insertions, 0 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 new file mode 100644 index 0000000000..5246b4b26c --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From a9421d55102fc84f77f7c21a2479fcd00652b896 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Mon, 25 Feb 2019 13:55:12 +0800 | ||
4 | Subject: [PATCH 03/24] missing_type.h: add __compare_fn_t and comparison_fn_t | ||
5 | |||
6 | Make it work with musl where comparison_fn_t and __compare_fn_t | ||
7 | is not provided. | ||
8 | |||
9 | Upstream-Status: Inappropriate [musl specific] | ||
10 | |||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
12 | --- | ||
13 | src/basic/missing_type.h | 9 +++++++++ | ||
14 | src/basic/util.h | 1 + | ||
15 | src/journal/catalog.c | 1 + | ||
16 | 3 files changed, 11 insertions(+) | ||
17 | |||
18 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | ||
19 | index bf8a6ca..c487e65 100644 | ||
20 | --- a/src/basic/missing_type.h | ||
21 | +++ b/src/basic/missing_type.h | ||
22 | @@ -10,3 +10,12 @@ | ||
23 | #if !HAVE_CHAR16_T | ||
24 | #define char16_t uint16_t | ||
25 | #endif | ||
26 | + | ||
27 | +#ifndef __GLIBC__ | ||
28 | +typedef int (*comparison_fn_t)(const void *, const void *); | ||
29 | +#endif | ||
30 | + | ||
31 | +#ifndef __COMPAR_FN_T | ||
32 | +#define __COMPAR_FN_T | ||
33 | +typedef int (*__compar_fn_t)(const void *, const void *); | ||
34 | +#endif | ||
35 | diff --git a/src/basic/util.h b/src/basic/util.h | ||
36 | index 9f6a6ce..2c5dc32 100644 | ||
37 | --- a/src/basic/util.h | ||
38 | +++ b/src/basic/util.h | ||
39 | @@ -26,6 +26,7 @@ | ||
40 | #include "format-util.h" | ||
41 | #include "macro.h" | ||
42 | #include "time-util.h" | ||
43 | +#include "missing.h" | ||
44 | |||
45 | size_t page_size(void) _pure_; | ||
46 | #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) | ||
47 | diff --git a/src/journal/catalog.c b/src/journal/catalog.c | ||
48 | index 4062f12..034e00c 100644 | ||
49 | --- a/src/journal/catalog.c | ||
50 | +++ b/src/journal/catalog.c | ||
51 | @@ -26,6 +26,7 @@ | ||
52 | #include "strv.h" | ||
53 | #include "tmpfile-util.h" | ||
54 | #include "util.h" | ||
55 | +#include "missing.h" | ||
56 | |||
57 | const char * const catalog_file_dirs[] = { | ||
58 | "/usr/local/lib/systemd/catalog/", | ||
59 | -- | ||
60 | 2.7.4 | ||
61 | |||