summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOle André Vadla Ravnås <oleavr@gmail.com>2022-03-31 14:42:03 +0200
committerGitHub <noreply@github.com>2022-03-31 08:42:03 -0400
commite3cf8b806c3ca919f95b9d33d6037869a059c035 (patch)
treefcc9afb08f891494551e9661f6912b258f8e1049 /src
parentc086cacb8b9665fab0c046fc92959fc8af5239b8 (diff)
downloadlibffi-e3cf8b806c3ca919f95b9d33d6037869a059c035.tar.gz
Allow system to have overlapping mallopt defines (#700)
Which is the case on some OSes, such as QNX.
Diffstat (limited to 'src')
-rw-r--r--src/dlmalloc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/dlmalloc.c b/src/dlmalloc.c
index 1aba657..6f4a5f6 100644
--- a/src/dlmalloc.c
+++ b/src/dlmalloc.c
@@ -592,6 +592,11 @@ DEFAULT_MMAP_THRESHOLD default: 256K
malloc does support the following options.
*/
+/* The system's malloc.h may have conflicting defines. */
+#undef M_TRIM_THRESHOLD
+#undef M_GRANULARITY
+#undef M_MMAP_THRESHOLD
+
#define M_TRIM_THRESHOLD (-1)
#define M_GRANULARITY (-2)
#define M_MMAP_THRESHOLD (-3)