blob: 4cce9a3fe6aded13ea9996462f60cc04ee64ba50 [file] [log] [blame]
Andrew Geisslerd5838332022-05-27 11:33:10 -05001From a0450f7909348e7ff1d58adc0aee4119a0519c1f Mon Sep 17 00:00:00 2001
Brad Bishop19323692019-04-05 15:28:33 -04002From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 15:00:06 +0800
William A. Kennington IIIac69b482021-06-02 12:28:27 -07004Subject: [PATCH] add missing FTW_ macros for musl
Brad Bishop19323692019-04-05 15:28:33 -04005
6This is to avoid build failures like below for musl.
7
8 locale-util.c:296:24: error: 'FTW_STOP' undeclared
9
Andrew Geisslerd5838332022-05-27 11:33:10 -050010Revisit this when upgrading to 251+ since most of these defines are not
11needed anymore except FTW_CONTINUE
12
Brad Bishop19323692019-04-05 15:28:33 -040013Upstream-Status: Inappropriate [musl specific]
14
15Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Andrew Geissler595f6302022-01-24 19:11:47 +000016
Brad Bishop19323692019-04-05 15:28:33 -040017---
Andrew Geisslerd5838332022-05-27 11:33:10 -050018 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 Bishop19323692019-04-05 15:28:33 -040022
Andrew Geisslerd5838332022-05-27 11:33:10 -050023diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
24index aeaf6ad5ec..3df1084ef2 100644
Brad Bishop19323692019-04-05 15:28:33 -040025--- a/src/basic/missing_type.h
26+++ b/src/basic/missing_type.h
Andrew Geisslerd5838332022-05-27 11:33:10 -050027@@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *);
Brad Bishop19323692019-04-05 15:28:33 -040028 #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 Geisslerd5838332022-05-27 11:33:10 -050051diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
52index 7917968497..cc3d5baaab 100644
Andrew Geisslereff27472021-10-29 15:35:00 -050053--- 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 Geisslerd5838332022-05-27 11:33:10 -050063diff --git a/src/test/test-recurse-dir.c b/src/test/test-recurse-dir.c
64index 2c2120b136..bc60a178a2 100644
Andrew Geissler7e0e3c02022-02-25 20:34:39 +000065--- 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