diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-10-06 17:34:44 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-10-06 17:34:44 -0700 |
| commit | c7e460d60b16583b4d920c7cf2e9e73c0ae9ba05 (patch) | |
| tree | aa3cf09a9a7f9571e7c3f88d036154e5ba89725c /src/dlmalloc.c | |
| parent | 8511f89492a089bc3297979d1d17dacb80c28362 (diff) | |
consolidate dlmalloc.c files; fixes test_dlmalloc_linked
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 338e430e..eb9c6487 100644 --- a/src/dlmalloc.c +++ b/src/dlmalloc.c @@ -1,4 +1,7 @@ #include "emscripten.h" +#define __THROW +#define __attribute_malloc__ +#define __wur /* This is a version (aka dlmalloc) of malloc/free/realloc written by @@ -590,7 +593,7 @@ MAX_RELEASE_CHECK_RATE default: 4095 unless not HAVE_MMAP #define MMAP_CLEARS 1 #endif /* MMAP_CLEARS */ #ifndef HAVE_MREMAP -#ifdef linux +#if linux && !defined(EMSCRIPTEN) #define HAVE_MREMAP 1 #else /* linux */ #define HAVE_MREMAP 0 |