aboutsummaryrefslogtreecommitdiff
path: root/libffi/src/dlmalloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'libffi/src/dlmalloc.c')
-rw-r--r--libffi/src/dlmalloc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libffi/src/dlmalloc.c b/libffi/src/dlmalloc.c
index 7e4ea83..1aba657 100644
--- a/libffi/src/dlmalloc.c
+++ b/libffi/src/dlmalloc.c
@@ -438,6 +438,11 @@ DEFAULT_MMAP_THRESHOLD default: 256K
*/
+#if defined __linux__ && !defined _GNU_SOURCE
+/* mremap() on Linux requires this via sys/mman.h */
+#define _GNU_SOURCE 1
+#endif
+
#ifndef WIN32
#ifdef _WIN32
#define WIN32 1
@@ -2366,7 +2371,7 @@ static size_t traverse_and_check(mstate m);
#else /* GNUC */
#if USE_BUILTIN_FFS
-#define compute_bit2idx(X, I) I = ffs(X)-1
+#define compute_bit2idx(X, I) I = __builtin_ffs(X)-1
#else /* USE_BUILTIN_FFS */
#define compute_bit2idx(X, I)\