Merge pull request #496 from nicolas-raoul/unit-test-for-issue2907

[mono.git] / mono / utils / dlmalloc.c

diff --git a/mono/utils/dlmalloc.c b/mono/utils/dlmalloc.c
index 74f5c542ab68aab6c41b0568d4d5a987d7710891..9ca6ed4a0fa41835cc61ab7f5674bc92e39a4549 100644 (file)
--- a/mono/utils/dlmalloc.c
+++ b/mono/utils/dlmalloc.c
@@ -483,6 +483,13 @@ DEFAULT_MMAP_THRESHOLD       default: 256K
 #endif  /* HAVE_MORECORE */
 #endif  /* DARWIN */
 
+#if defined(__native_client__)
+#undef HAVE_MMAP
+#undef HAVE_MREMAP
+#define HAVE_MMAP 0
+#define HAVE_MREMAP 0
+#endif
+
 #ifndef LACKS_SYS_TYPES_H
 #include <sys/types.h>  /* For size_t */
 #endif  /* LACKS_SYS_TYPES_H */
@@ -3822,6 +3829,8 @@ static void* internal_realloc(mstate m, void* oldmem, size_t bytes) {
   return 0;
 }
 
+#endif
+
 /* --------------------------- memalign support -------------------------- */
 
 static void* internal_memalign(mstate m, size_t alignment, size_t bytes) {
@@ -3909,6 +3918,8 @@ static void* internal_memalign(mstate m, size_t alignment, size_t bytes) {
   return 0;
 }
 
+#if 0
+
 /* ------------------------ comalloc/coalloc support --------------------- */
 
 static void** ialloc(mstate m,
@@ -4315,10 +4326,14 @@ void* dlrealloc(void* oldmem, size_t bytes) {
   }
 }
 
+#endif
+
 void* dlmemalign(size_t alignment, size_t bytes) {
   return internal_memalign(gm, alignment, bytes);
 }
 
+#if 0
+
 void** dlindependent_calloc(size_t n_elements, size_t elem_size,
                                  void* chunks[]) {
   size_t sz = elem_size; /* serves as 1-element array */