| From 3fbf61d54b82fc9bf21d8039bfd89dc9efc5bbcd Mon Sep 17 00:00:00 2001 |
| From: Chen Qi <Qi.Chen@windriver.com> |
| Date: Mon, 25 Feb 2019 15:44:54 +0800 |
| Subject: [PATCH 21/24] avoid redefinition of prctl_mm_map structure |
| |
| Fix the following compile failure: |
| error: redefinition of 'struct prctl_mm_map' |
| |
| Upstream-Status: Inappropriate [musl specific] |
| |
| Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| --- |
| src/basic/missing_prctl.h | 2 ++ |
| src/basic/util.h | 3 ++- |
| 2 files changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h |
| index f80cd17..47e4893 100644 |
| --- a/src/basic/missing_prctl.h |
| +++ b/src/basic/missing_prctl.h |
| @@ -1,7 +1,9 @@ |
| /* SPDX-License-Identifier: LGPL-2.1+ */ |
| #pragma once |
| |
| +#ifdef __GLIBC__ |
| #include <linux/prctl.h> |
| +#endif |
| |
| /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ |
| #ifndef PR_CAP_AMBIENT |
| diff --git a/src/basic/util.h b/src/basic/util.h |
| index 2c5dc32..f721184 100644 |
| --- a/src/basic/util.h |
| +++ b/src/basic/util.h |
| @@ -26,7 +26,8 @@ |
| #include "format-util.h" |
| #include "macro.h" |
| #include "time-util.h" |
| -#include "missing.h" |
| +#include "missing_stdlib.h" |
| +#include "missing_type.h" |
| |
| size_t page_size(void) _pure_; |
| #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) |
| -- |
| 2.7.4 |
| |