diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-01-10 15:16:27 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-01-10 15:16:27 -0800 |
| commit | 0a71c5438c46d535cc714b927ae328563d76eba6 (patch) | |
| tree | 76694c3ba9e965db29320fc964bfab0e4ee968f4 /src/dlmalloc.c | |
| parent | c5c0d1af29a152eb9504757e60ed3a2c48ea28cc (diff) | |
| parent | ef3c715e8338b1f076d89239fe20aaa69956d743 (diff) | |
Merge pull request #169 from jterrace/mmap_malloc_dlmalloc_fixes
malloc and mmap fixes
Diffstat (limited to 'src/dlmalloc.c')
| -rw-r--r-- | src/dlmalloc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dlmalloc.c b/src/dlmalloc.c index aa37dc0d..6185b1c7 100644 --- a/src/dlmalloc.c +++ b/src/dlmalloc.c @@ -588,7 +588,10 @@ MAX_RELEASE_CHECK_RATE default: 4095 unless not HAVE_MMAP #define INSECURE 0 #endif /* INSECURE */ #ifndef HAVE_MMAP -#define HAVE_MMAP 1 +/* XXX Emscripten + * mmap uses malloc, so malloc can't use mmap + */ +#define HAVE_MMAP 0 #endif /* HAVE_MMAP */ #ifndef MMAP_CLEARS #define MMAP_CLEARS 1 |