aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2011-10-02 14:34:50 +0200
committerAlon Zakai <alonzakai@gmail.com>2011-10-02 14:34:50 +0200
commit68f981b12960adb4ebcae263d7877226fd744fca (patch)
tree3ef3113951e06222bf859c99b5265c4e88ac5aaa
parent28638ac57c6e9a84979d11f953b377a34ce53828 (diff)
dlmalloc fixes
-rw-r--r--tests/dlmalloc.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/dlmalloc.c b/tests/dlmalloc.c
index e6bf434d..839ef308 100644
--- a/tests/dlmalloc.c
+++ b/tests/dlmalloc.c
@@ -1,4 +1,10 @@
#include "emscripten.h"
+#define __THROW
+#define __attribute_malloc__
+#define __wur
+
+
+/* ===== begin dlmalloc.c ===== */
/*
This is a version (aka dlmalloc) of malloc/free/realloc written by
@@ -590,7 +596,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