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:
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_.patch78
1 files changed, 0 insertions, 78 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
deleted file mode 100644
index f43a22aa8b..0000000000
--- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
+++ /dev/null
@@ -1,78 +0,0 @@
1From 9f0d5996bbb2db3679a4075fa8301750b786c03b Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 13:55:12 +0800
4Subject: [PATCH 03/26] missing_type.h: add __compare_fn_t and comparison_fn_t
5
6Make it work with musl where comparison_fn_t and __compare_fn_t
7is not provided.
8
9Upstream-Status: Inappropriate [musl specific]
10
11Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
12[Rebased for v244]
13Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
14[Rebased for v242]
15Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
16---
17 src/basic/missing_type.h | 9 +++++++++
18 src/basic/sort-util.h | 1 +
19 src/core/kmod-setup.c | 1 +
20 src/journal/catalog.c | 1 +
21 4 files changed, 12 insertions(+)
22
23diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
24index f6233090a9..aeaf6ad5ec 100644
25--- a/src/basic/missing_type.h
26+++ b/src/basic/missing_type.h
27@@ -10,3 +10,12 @@
28 #if !HAVE_CHAR16_T
29 #define char16_t uint16_t
30 #endif
31+
32+#ifndef __GLIBC__
33+typedef int (*comparison_fn_t)(const void *, const void *);
34+#endif
35+
36+#ifndef __COMPAR_FN_T
37+#define __COMPAR_FN_T
38+typedef int (*__compar_fn_t)(const void *, const void *);
39+#endif
40diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
41index 3394c9eb72..d9cb2aecb6 100644
42--- a/src/basic/sort-util.h
43+++ b/src/basic/sort-util.h
44@@ -4,6 +4,7 @@
45 #include <stdlib.h>
46
47 #include "macro.h"
48+#include "missing_type.h"
49
50 void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
51 __compar_d_fn_t compar, void *arg);
52diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
53index 8a7f82812a..a56f12f47f 100644
54--- a/src/core/kmod-setup.c
55+++ b/src/core/kmod-setup.c
56@@ -10,6 +10,7 @@
57 #include "kmod-setup.h"
58 #include "macro.h"
59 #include "string-util.h"
60+#include "missing_type.h"
61
62 #if HAVE_KMOD
63 #include "module-util.h"
64diff --git a/src/journal/catalog.c b/src/journal/catalog.c
65index 0f6ad8a29e..4e1077ade4 100644
66--- a/src/journal/catalog.c
67+++ b/src/journal/catalog.c
68@@ -28,6 +28,7 @@
69 #include "string-util.h"
70 #include "strv.h"
71 #include "tmpfile-util.h"
72+#include "missing_type.h"
73
74 const char * const catalog_file_dirs[] = {
75 "/usr/local/lib/systemd/catalog/",
76--
772.27.0
78