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 | |
| 10 | Upstream-Status: Inappropriate [musl specific] |
| 11 | |
| 12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 13 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 14 | --- |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 15 | src/basic/missing_type.h | 4 ++++ |
| 16 | src/test/test-recurse-dir.c | 1 + |
| 17 | 2 files changed, 5 insertions(+) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 18 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 19 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 20 | index 6c0456349d..73a5b90e3c 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 21 | --- a/src/basic/missing_type.h |
| 22 | +++ b/src/basic/missing_type.h |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 23 | @@ -14,3 +14,7 @@ |
| 24 | #ifndef __GLIBC__ |
| 25 | typedef int (*comparison_fn_t)(const void *, const void *); |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 26 | #endif |
| 27 | + |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 28 | +#ifndef FTW_CONTINUE |
| 29 | +#define FTW_CONTINUE 0 |
| 30 | +#endif |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 31 | diff --git a/src/test/test-recurse-dir.c b/src/test/test-recurse-dir.c |
| 32 | index 2c2120b136..bc60a178a2 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 33 | --- a/src/test/test-recurse-dir.c |
| 34 | +++ b/src/test/test-recurse-dir.c |
| 35 | @@ -6,6 +6,7 @@ |
| 36 | #include "recurse-dir.h" |
| 37 | #include "strv.h" |
| 38 | #include "tests.h" |
| 39 | +#include "missing_type.h" |
| 40 | |
| 41 | static char **list_nftw = NULL; |
| 42 | |