From b052f13cd1215cf444f16ccf14c96e32f61f73e0 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 20 Apr 2011 15:55:58 -0400 Subject: [PATCH] namespace fixes for sys/mman.h --- arch/i386/bits/mman.h | 32 ++++++++++++++++---------------- arch/x86_64/bits/mman.h | 32 ++++++++++++++++---------------- src/malloc/malloc.c | 1 + 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/arch/i386/bits/mman.h b/arch/i386/bits/mman.h index d133fa20..302044eb 100644 --- a/arch/i386/bits/mman.h +++ b/arch/i386/bits/mman.h @@ -11,27 +11,12 @@ #define MAP_PRIVATE 0x02 #define MAP_FIXED 0x10 -/* linux extensions */ #define MAP_TYPE 0x0f #define MAP_FILE 0x00 #define MAP_ANON 0x20 #define MAP_ANONYMOUS MAP_ANON #define MAP_32BIT 0x40 -#define MADV_NORMAL 0 -#define MADV_RANDOM 1 -#define MADV_SEQUENTIAL 2 -#define MADV_WILLNEED 3 -#define MADV_DONTNEED 4 -#define MADV_REMOVE 9 -#define MADV_DONTFORK 10 -#define MADV_DOFORK 11 -#define MADV_MERGEABLE 12 -#define MADV_UNMERGEABLE 13 -#define MADV_HUGEPAGE 14 -#define MADV_NOHUGEPAGE 15 -#define MADV_HWPOISON 100 - #define POSIX_MADV_NORMAL 0 #define POSIX_MADV_RANDOM 1 #define POSIX_MADV_SEQUENTIAL 2 @@ -45,6 +30,21 @@ #define MCL_CURRENT 1 #define MCL_FUTURE 2 -/* linux extensions */ +#ifdef _GNU_SOURCE +#define MADV_NORMAL 0 +#define MADV_RANDOM 1 +#define MADV_SEQUENTIAL 2 +#define MADV_WILLNEED 3 +#define MADV_DONTNEED 4 +#define MADV_REMOVE 9 +#define MADV_DONTFORK 10 +#define MADV_DOFORK 11 +#define MADV_MERGEABLE 12 +#define MADV_UNMERGEABLE 13 +#define MADV_HUGEPAGE 14 +#define MADV_NOHUGEPAGE 15 +#define MADV_HWPOISON 100 + #define MREMAP_MAYMOVE 1 #define MREMAP_FIXED 2 +#endif diff --git a/arch/x86_64/bits/mman.h b/arch/x86_64/bits/mman.h index cd6cb845..dc61b500 100644 --- a/arch/x86_64/bits/mman.h +++ b/arch/x86_64/bits/mman.h @@ -11,27 +11,12 @@ #define MAP_PRIVATE 0x02 #define MAP_FIXED 0x10 -/* linux extensions */ #define MAP_TYPE 0x0f #define MAP_FILE 0x00 #define MAP_ANON 0x20 #define MAP_ANONYMOUS MAP_ANON #define MAP_32BIT 0x40 -#define MADV_NORMAL 0 -#define MADV_RANDOM 1 -#define MADV_SEQUENTIAL 2 -#define MADV_WILLNEED 3 -#define MADV_DONTNEED 4 -#define MADV_REMOVE 9 -#define MADV_DONTFORK 10 -#define MADV_DOFORK 11 -#define MADV_MERGEABLE 12 -#define MADV_UNMERGEABLE 13 -#define MADV_HUGEPAGE 14 -#define MADV_NOHUGEPAGE 15 -#define MADV_HWPOISON 100 - #define POSIX_MADV_NORMAL 0 #define POSIX_MADV_RANDOM 1 #define POSIX_MADV_SEQUENTIAL 2 @@ -45,6 +30,21 @@ #define MCL_CURRENT 1 #define MCL_FUTURE 2 -/* linux extensions */ +#ifdef _GNU_SOURCE +#define MADV_NORMAL 0 +#define MADV_RANDOM 1 +#define MADV_SEQUENTIAL 2 +#define MADV_WILLNEED 3 +#define MADV_DONTNEED 4 +#define MADV_REMOVE 9 +#define MADV_DONTFORK 10 +#define MADV_DOFORK 11 +#define MADV_MERGEABLE 12 +#define MADV_UNMERGEABLE 13 +#define MADV_HUGEPAGE 14 +#define MADV_NOHUGEPAGE 15 +#define MADV_HWPOISON 100 + #define MREMAP_MAYMOVE 1 #define MREMAP_FIXED 2 +#endif diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c index 46cc21fb..bc8382e4 100644 --- a/src/malloc/malloc.c +++ b/src/malloc/malloc.c @@ -1,3 +1,4 @@ +#define _GNU_SOURCE #include #include #include