namespace fixes for sys/mman.h

diff --git a/arch/i386/bits/mman.h b/arch/i386/bits/mman.h
index d133fa20658ac335273550cd1f18e3f921b5bfc2..302044eb30c65dd40d681c520d73395d889ee611 100644 (file)
--- 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 cd6cb8450b67d6b6cdbc9ee9caee1e46d8ddfdd8..dc61b500579edc24e50fff962b9e3078cb0c3b78 100644 (file)
--- 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 46cc21fb7b54ed95310c51e7ac0ee6a285ff5532..bc8382e48862a7d12986fcb1a078544daf860f9a 100644 (file)
--- 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>