Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 1 | From a0450f7909348e7ff1d58adc0aee4119a0519c1f 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 15:00:06 +0800 |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 4 | Subject: [PATCH] add missing FTW_ macros for musl |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 5 | |
| 6 | This is to avoid build failures like below for musl. |
| 7 | |
| 8 | locale-util.c:296:24: error: 'FTW_STOP' undeclared |
| 9 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 10 | Revisit this when upgrading to 251+ since most of these defines are not |
| 11 | needed anymore except FTW_CONTINUE |
| 12 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 13 | Upstream-Status: Inappropriate [musl specific] |
| 14 | |
| 15 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 16 | |
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 | 20 ++++++++++++++++++++ |
| 19 | src/shared/mount-setup.c | 1 + |
| 20 | src/test/test-recurse-dir.c | 1 + |
| 21 | 3 files changed, 22 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 aeaf6ad5ec..3df1084ef2 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 | @@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *); |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 28 | #define __COMPAR_FN_T |
| 29 | typedef int (*__compar_fn_t)(const void *, const void *); |
| 30 | #endif |
| 31 | + |
| 32 | +#ifndef FTW_ACTIONRETVAL |
| 33 | +#define FTW_ACTIONRETVAL 16 |
| 34 | +#endif |
| 35 | + |
| 36 | +#ifndef FTW_CONTINUE |
| 37 | +#define FTW_CONTINUE 0 |
| 38 | +#endif |
| 39 | + |
| 40 | +#ifndef FTW_STOP |
| 41 | +#define FTW_STOP 1 |
| 42 | +#endif |
| 43 | + |
| 44 | +#ifndef FTW_SKIP_SUBTREE |
| 45 | +#define FTW_SKIP_SUBTREE 2 |
| 46 | +#endif |
| 47 | + |
| 48 | +#ifndef FTW_SKIP_SIBLINGS |
| 49 | +#define FTW_SKIP_SIBLINGS 3 |
| 50 | +#endif |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 51 | diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c |
| 52 | index 7917968497..cc3d5baaab 100644 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 53 | --- a/src/shared/mount-setup.c |
| 54 | +++ b/src/shared/mount-setup.c |
| 55 | @@ -32,6 +32,7 @@ |
| 56 | #include "strv.h" |
| 57 | #include "user-util.h" |
| 58 | #include "virt.h" |
| 59 | +#include "missing_type.h" |
| 60 | |
| 61 | typedef enum MountMode { |
| 62 | MNT_NONE = 0, |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 63 | diff --git a/src/test/test-recurse-dir.c b/src/test/test-recurse-dir.c |
| 64 | index 2c2120b136..bc60a178a2 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 65 | --- a/src/test/test-recurse-dir.c |
| 66 | +++ b/src/test/test-recurse-dir.c |
| 67 | @@ -6,6 +6,7 @@ |
| 68 | #include "recurse-dir.h" |
| 69 | #include "strv.h" |
| 70 | #include "tests.h" |
| 71 | +#include "missing_type.h" |
| 72 | |
| 73 | static char **list_nftw = NULL; |
| 74 | |