summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-04-20 15:55:58 -0400
committerRich Felker <dalias@aerifal.cx>2011-04-20 15:55:58 -0400
commitb052f13cd1215cf444f16ccf14c96e32f61f73e0 (patch)
tree4b1f027b51d17d54b1a81e29f36b67d4603e0a27
parent53ab4e793bcff0dd5fa9cf76a4170cbacae342c9 (diff)
downloadmusl-b052f13cd1215cf444f16ccf14c96e32f61f73e0.tar.gz
musl-b052f13cd1215cf444f16ccf14c96e32f61f73e0.tar.bz2
musl-b052f13cd1215cf444f16ccf14c96e32f61f73e0.tar.xz
musl-b052f13cd1215cf444f16ccf14c96e32f61f73e0.zip
namespace fixes for sys/mman.h
-rw-r--r--arch/i386/bits/mman.h30
-rw-r--r--arch/x86_64/bits/mman.h30
-rw-r--r--src/malloc/malloc.c1
3 files changed, 31 insertions, 30 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,13 +11,26 @@
#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 POSIX_MADV_NORMAL 0
+#define POSIX_MADV_RANDOM 1
+#define POSIX_MADV_SEQUENTIAL 2
+#define POSIX_MADV_WILLNEED 3
+#define POSIX_MADV_DONTNEED 0
+
+#define MS_ASYNC 1
+#define MS_INVALIDATE 2
+#define MS_SYNC 4
+
+#define MCL_CURRENT 1
+#define MCL_FUTURE 2
+
+#ifdef _GNU_SOURCE
#define MADV_NORMAL 0
#define MADV_RANDOM 1
#define MADV_SEQUENTIAL 2
@@ -32,19 +45,6 @@
#define MADV_NOHUGEPAGE 15
#define MADV_HWPOISON 100
-#define POSIX_MADV_NORMAL 0
-#define POSIX_MADV_RANDOM 1
-#define POSIX_MADV_SEQUENTIAL 2
-#define POSIX_MADV_WILLNEED 3
-#define POSIX_MADV_DONTNEED 0
-
-#define MS_ASYNC 1
-#define MS_INVALIDATE 2
-#define MS_SYNC 4
-
-#define MCL_CURRENT 1
-#define MCL_FUTURE 2
-
-/* linux extensions */
#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,13 +11,26 @@
#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 POSIX_MADV_NORMAL 0
+#define POSIX_MADV_RANDOM 1
+#define POSIX_MADV_SEQUENTIAL 2
+#define POSIX_MADV_WILLNEED 3
+#define POSIX_MADV_DONTNEED 0
+
+#define MS_ASYNC 1
+#define MS_INVALIDATE 2
+#define MS_SYNC 4
+
+#define MCL_CURRENT 1
+#define MCL_FUTURE 2
+
+#ifdef _GNU_SOURCE
#define MADV_NORMAL 0
#define MADV_RANDOM 1
#define MADV_SEQUENTIAL 2
@@ -32,19 +45,6 @@
#define MADV_NOHUGEPAGE 15
#define MADV_HWPOISON 100
-#define POSIX_MADV_NORMAL 0
-#define POSIX_MADV_RANDOM 1
-#define POSIX_MADV_SEQUENTIAL 2
-#define POSIX_MADV_WILLNEED 3
-#define POSIX_MADV_DONTNEED 0
-
-#define MS_ASYNC 1
-#define MS_INVALIDATE 2
-#define MS_SYNC 4
-
-#define MCL_CURRENT 1
-#define MCL_FUTURE 2
-
-/* linux extensions */
#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 <stdlib.h>
#include <string.h>
#include <limits.h>