blob: 9540f967bbc8daf2956599bdb699d7d211843c3d [file] [log] [blame]
Andrew Geisslereff27472021-10-29 15:35:00 -05001From 45b78e3dc3edead4fc9883dd5a9877f473367bf7 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
10Upstream-Status: Inappropriate [musl specific]
11
12Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
13---
14 src/basic/missing_type.h | 20 ++++++++++++++++++++
Andrew Geisslereff27472021-10-29 15:35:00 -050015 src/shared/mount-setup.c | 1 +
16 2 files changed, 21 insertions(+)
Brad Bishop19323692019-04-05 15:28:33 -040017
18diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
Andrew Geisslerd1e89492021-02-12 15:35:20 -060019index aeaf6ad5ec..3df1084ef2 100644
Brad Bishop19323692019-04-05 15:28:33 -040020--- a/src/basic/missing_type.h
21+++ b/src/basic/missing_type.h
22@@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *);
23 #define __COMPAR_FN_T
24 typedef int (*__compar_fn_t)(const void *, const void *);
25 #endif
26+
27+#ifndef FTW_ACTIONRETVAL
28+#define FTW_ACTIONRETVAL 16
29+#endif
30+
31+#ifndef FTW_CONTINUE
32+#define FTW_CONTINUE 0
33+#endif
34+
35+#ifndef FTW_STOP
36+#define FTW_STOP 1
37+#endif
38+
39+#ifndef FTW_SKIP_SUBTREE
40+#define FTW_SKIP_SUBTREE 2
41+#endif
42+
43+#ifndef FTW_SKIP_SIBLINGS
44+#define FTW_SKIP_SIBLINGS 3
45+#endif
Andrew Geisslereff27472021-10-29 15:35:00 -050046diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
47index ef3527e9a7..c1cab40eb8 100644
48--- a/src/shared/mount-setup.c
49+++ b/src/shared/mount-setup.c
50@@ -32,6 +32,7 @@
51 #include "strv.h"
52 #include "user-util.h"
53 #include "virt.h"
54+#include "missing_type.h"
55
56 typedef enum MountMode {
57 MNT_NONE = 0,