William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 1 | From 4afb8adc83348bf75964fc10af7902e04dd62637 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
| 3 | Date: Mon, 25 Feb 2019 13:55:12 +0800 |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 4 | Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 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 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 11 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
| 12 | [Rebased for v244] |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 14 | [Rebased for v242] |
| 15 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 16 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 17 | --- |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 18 | src/basic/missing_type.h | 9 +++++++++ |
| 19 | src/basic/sort-util.h | 1 + |
| 20 | src/core/kmod-setup.c | 1 + |
| 21 | src/libsystemd/sd-journal/catalog.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 22 | 4 files changed, 12 insertions(+) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 23 | |
| 24 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 25 | index f6233090a9..aeaf6ad5ec 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 26 | --- a/src/basic/missing_type.h |
| 27 | +++ b/src/basic/missing_type.h |
| 28 | @@ -10,3 +10,12 @@ |
| 29 | #if !HAVE_CHAR16_T |
| 30 | #define char16_t uint16_t |
| 31 | #endif |
| 32 | + |
| 33 | +#ifndef __GLIBC__ |
| 34 | +typedef int (*comparison_fn_t)(const void *, const void *); |
| 35 | +#endif |
| 36 | + |
| 37 | +#ifndef __COMPAR_FN_T |
| 38 | +#define __COMPAR_FN_T |
| 39 | +typedef int (*__compar_fn_t)(const void *, const void *); |
| 40 | +#endif |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 41 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 42 | index d92a5ab0ed..a63867c716 100644 |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 43 | --- a/src/basic/sort-util.h |
| 44 | +++ b/src/basic/sort-util.h |
| 45 | @@ -4,6 +4,7 @@ |
| 46 | #include <stdlib.h> |
| 47 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 48 | #include "macro.h" |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 49 | +#include "missing_type.h" |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 50 | |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 51 | void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, |
| 52 | __compar_d_fn_t compar, void *arg); |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 53 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 54 | index 8a7f82812a..a56f12f47f 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 55 | --- a/src/core/kmod-setup.c |
| 56 | +++ b/src/core/kmod-setup.c |
| 57 | @@ -10,6 +10,7 @@ |
| 58 | #include "kmod-setup.h" |
| 59 | #include "macro.h" |
| 60 | #include "string-util.h" |
| 61 | +#include "missing_type.h" |
| 62 | |
| 63 | #if HAVE_KMOD |
| 64 | #include "module-util.h" |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 65 | diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c |
| 66 | index aea3241d18..75e6c56a28 100644 |
| 67 | --- a/src/libsystemd/sd-journal/catalog.c |
| 68 | +++ b/src/libsystemd/sd-journal/catalog.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 69 | @@ -28,6 +28,7 @@ |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 70 | #include "string-util.h" |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 71 | #include "strv.h" |
| 72 | #include "tmpfile-util.h" |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 73 | +#include "missing_type.h" |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 74 | |
| 75 | const char * const catalog_file_dirs[] = { |
| 76 | "/usr/local/lib/systemd/catalog/", |