Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From b216435bb362df10c45f544b78d8c884eaa901fd Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 8 Jan 2016 07:01:02 +0000 |
| 4 | Subject: [PATCH 21/32] Define _GNU_SOURCE for MREMAP_MAYMOVE definition |
| 5 | |
| 6 | musl guards MREMAP_MAYMOVE with _GNU_SOURCE unlike glibc which uses |
| 7 | __USE_GNU |
| 8 | |
| 9 | Fixes errors like |
| 10 | error: 'MREMAP_MAYMOVE' undeclared (first use in this function) |
| 11 | |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 13 | |
| 14 | Upstream-Status: Pending |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 15 | --- |
| 16 | testcases/kernel/syscalls/mremap/mremap01.c | 4 +++- |
| 17 | testcases/kernel/syscalls/mremap/mremap02.c | 2 ++ |
| 18 | testcases/kernel/syscalls/mremap/mremap03.c | 2 ++ |
| 19 | 3 files changed, 7 insertions(+), 1 deletion(-) |
| 20 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 21 | diff --git a/testcases/kernel/syscalls/mremap/mremap01.c b/testcases/kernel/syscalls/mremap/mremap01.c |
| 22 | index d63d1e4..24ca174 100644 |
| 23 | --- a/testcases/kernel/syscalls/mremap/mremap01.c |
| 24 | +++ b/testcases/kernel/syscalls/mremap/mremap01.c |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 25 | @@ -76,10 +76,12 @@ |
| 26 | */ |
| 27 | #include <unistd.h> |
| 28 | #include <errno.h> |
| 29 | +#include <fcntl.h> |
| 30 | +#define _GNU_SOURCE |
| 31 | #define __USE_GNU |
| 32 | #include <sys/mman.h> |
| 33 | #undef __USE_GNU |
| 34 | -#include <fcntl.h> |
| 35 | +#undef _GNU_SOURCE |
| 36 | |
| 37 | #include "test.h" |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 38 | #include "safe_macros.h" |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 39 | diff --git a/testcases/kernel/syscalls/mremap/mremap02.c b/testcases/kernel/syscalls/mremap/mremap02.c |
| 40 | index 5a51b9a..a530a6b 100644 |
| 41 | --- a/testcases/kernel/syscalls/mremap/mremap02.c |
| 42 | +++ b/testcases/kernel/syscalls/mremap/mremap02.c |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 43 | @@ -75,9 +75,11 @@ |
| 44 | #include <errno.h> |
| 45 | #include <unistd.h> |
| 46 | #include <fcntl.h> |
| 47 | +#define _GNU_SOURCE |
| 48 | #define __USE_GNU |
| 49 | #include <sys/mman.h> |
| 50 | #undef __USE_GNU |
| 51 | +#undef _GNU_SOURCE |
| 52 | |
| 53 | #include "test.h" |
| 54 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 55 | diff --git a/testcases/kernel/syscalls/mremap/mremap03.c b/testcases/kernel/syscalls/mremap/mremap03.c |
| 56 | index 12e3829..9b39f8b 100644 |
| 57 | --- a/testcases/kernel/syscalls/mremap/mremap03.c |
| 58 | +++ b/testcases/kernel/syscalls/mremap/mremap03.c |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 59 | @@ -76,9 +76,11 @@ |
| 60 | #include <errno.h> |
| 61 | #include <unistd.h> |
| 62 | #include <fcntl.h> |
| 63 | +#define _GNU_SOURCE |
| 64 | #define __USE_GNU |
| 65 | #include <sys/mman.h> |
| 66 | #undef __USE_GNU |
| 67 | +#undef _GNU_SOURCE |
| 68 | |
| 69 | #include "test.h" |
| 70 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 71 | -- |
| 72 | 2.7.0 |
| 73 | |