| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 3fbf61d54b82fc9bf21d8039bfd89dc9efc5bbcd Mon Sep 17 00:00:00 2001 |
| 2 | From: Chen Qi <Qi.Chen@windriver.com> |
| 3 | Date: Mon, 25 Feb 2019 15:44:54 +0800 |
| 4 | Subject: [PATCH 21/24] avoid redefinition of prctl_mm_map structure |
| 5 | |
| 6 | Fix the following compile failure: |
| 7 | error: redefinition of 'struct prctl_mm_map' |
| 8 | |
| 9 | Upstream-Status: Inappropriate [musl specific] |
| 10 | |
| 11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 12 | --- |
| 13 | src/basic/missing_prctl.h | 2 ++ |
| 14 | src/basic/util.h | 3 ++- |
| 15 | 2 files changed, 4 insertions(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h |
| 18 | index f80cd17..47e4893 100644 |
| 19 | --- a/src/basic/missing_prctl.h |
| 20 | +++ b/src/basic/missing_prctl.h |
| 21 | @@ -1,7 +1,9 @@ |
| 22 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 23 | #pragma once |
| 24 | |
| 25 | +#ifdef __GLIBC__ |
| 26 | #include <linux/prctl.h> |
| 27 | +#endif |
| 28 | |
| 29 | /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ |
| 30 | #ifndef PR_CAP_AMBIENT |
| 31 | diff --git a/src/basic/util.h b/src/basic/util.h |
| 32 | index 2c5dc32..f721184 100644 |
| 33 | --- a/src/basic/util.h |
| 34 | +++ b/src/basic/util.h |
| 35 | @@ -26,7 +26,8 @@ |
| 36 | #include "format-util.h" |
| 37 | #include "macro.h" |
| 38 | #include "time-util.h" |
| 39 | -#include "missing.h" |
| 40 | +#include "missing_stdlib.h" |
| 41 | +#include "missing_type.h" |
| 42 | |
| 43 | size_t page_size(void) _pure_; |
| 44 | #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) |
| 45 | -- |
| 46 | 2.7.4 |
| 47 | |