Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 1 | From 5513b918d02900a3a78fd0e0300a118b163edfef 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 |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 4 | Subject: [PATCH] missing_type.h: add comparison_fn_t |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 5 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 6 | Make it work with musl where comparison_fn_t and is not provided. |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 7 | |
| 8 | Upstream-Status: Inappropriate [musl specific] |
| 9 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 10 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
| 11 | [Rebased for v244] |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 13 | [Rebased for v242] |
| 14 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 15 | [Rebased for v250, Drop __compare_fn_t] |
| 16 | Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 17 | --- |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 18 | src/basic/missing_type.h | 4 ++++ |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 19 | src/basic/sort-util.h | 1 + |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 20 | src/libsystemd/sd-journal/catalog.c | 1 + |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 21 | 3 files changed, 6 insertions(+) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 22 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 23 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h |
| 24 | index f6233090a9..6c0456349d 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 25 | --- a/src/basic/missing_type.h |
| 26 | +++ b/src/basic/missing_type.h |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 27 | @@ -10,3 +10,7 @@ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 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 |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 35 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h |
| 36 | index 02a6784d99..0b33c83d59 100644 |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 37 | --- a/src/basic/sort-util.h |
| 38 | +++ b/src/basic/sort-util.h |
| 39 | @@ -4,6 +4,7 @@ |
| 40 | #include <stdlib.h> |
| 41 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 42 | #include "macro.h" |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 43 | +#include "missing_type.h" |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 44 | |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 45 | /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the |
| 46 | * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 47 | diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c |
| 48 | index 8fc87b131a..36a6efdbd8 100644 |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 49 | --- a/src/libsystemd/sd-journal/catalog.c |
| 50 | +++ b/src/libsystemd/sd-journal/catalog.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 51 | @@ -28,6 +28,7 @@ |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 52 | #include "string-util.h" |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 53 | #include "strv.h" |
| 54 | #include "tmpfile-util.h" |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 55 | +#include "missing_type.h" |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 56 | |
| 57 | const char * const catalog_file_dirs[] = { |
| 58 | "/usr/local/lib/systemd/catalog/", |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 59 | -- |
| 60 | 2.34.1 |
| 61 | |