From 7ca9887f84adba065dc2e59b3de55ace2fc72ec0 Mon Sep 17 00:00:00 2001
|
From: Chen Qi <Qi.Chen@windriver.com>
|
Date: Mon, 25 Feb 2019 15:00:06 +0800
|
Subject: [PATCH] add missing FTW_ macros for musl
|
|
This is to avoid build failures like below for musl.
|
|
locale-util.c:296:24: error: 'FTW_STOP' undeclared
|
|
Upstream-Status: Inappropriate [musl specific]
|
|
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
|
---
|
src/basic/missing_type.h | 20 ++++++++++++++++++++
|
src/shared/mount-setup.c | 1 +
|
2 files changed, 21 insertions(+)
|
|
diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
|
index aeaf6ad5ec..3df1084ef2 100644
|
--- a/src/basic/missing_type.h
|
+++ b/src/basic/missing_type.h
|
@@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *);
|
#define __COMPAR_FN_T
|
typedef int (*__compar_fn_t)(const void *, const void *);
|
#endif
|
+
|
+#ifndef FTW_ACTIONRETVAL
|
+#define FTW_ACTIONRETVAL 16
|
+#endif
|
+
|
+#ifndef FTW_CONTINUE
|
+#define FTW_CONTINUE 0
|
+#endif
|
+
|
+#ifndef FTW_STOP
|
+#define FTW_STOP 1
|
+#endif
|
+
|
+#ifndef FTW_SKIP_SUBTREE
|
+#define FTW_SKIP_SUBTREE 2
|
+#endif
|
+
|
+#ifndef FTW_SKIP_SIBLINGS
|
+#define FTW_SKIP_SIBLINGS 3
|
+#endif
|
diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
|
index ef3527e9a7..c1cab40eb8 100644
|
--- a/src/shared/mount-setup.c
|
+++ b/src/shared/mount-setup.c
|
@@ -32,6 +32,7 @@
|
#include "strv.h"
|
#include "user-util.h"
|
#include "virt.h"
|
+#include "missing_type.h"
|
|
typedef enum MountMode {
|
MNT_NONE = 0,
|
