* src/mm/nogc.c [HAVE_SYS_MMAN_H] (sys/mman.h): Added #ifdef.

(heap_alloc_uncollectable): Added additional parameter for heap_alloc.
(gc_init) [HAVE_MMAP]: Added #ifdef.

diff --git a/src/mm/nogc.c b/src/mm/nogc.c
index 665b7f845af319527ca97d851218eb0dcf3fcd4f..c84deb46d05e303352388030e964664ebf545703 100644 (file)
--- a/src/mm/nogc.c
+++ b/src/mm/nogc.c
@@ -28,7 +28,10 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <sys/mman.h>
+
+#if defined(HAVE_SYS_MMAN_H)
+# include <sys/mman.h>
+#endif
 
 #include "vm/types.h"
 
@@ -79,7 +82,7 @@ void *heap_alloc(u4 size, u4 references, methodinfo *finalizer, bool collect)
 
 void *heap_alloc_uncollectable(u4 size)
 {
-       return heap_alloc(size, false, NULL);
+       return heap_alloc(size, false, NULL, false);
 }
 
 
@@ -94,6 +97,7 @@ void gc_init(u4 heapmaxsize, u4 heapstartsize)
 {
        heapmaxsize = MEMORY_ALIGN(heapmaxsize, ALIGNSIZE);
 
+#if defined(HAVE_MMAP)
        mmapptr = mmap((void *) MMAP_HEAPADDRESS,
                                   (size_t) heapmaxsize,
                                   PROT_READ | PROT_WRITE,
@@ -110,6 +114,12 @@ void gc_init(u4 heapmaxsize, u4 heapstartsize)
 
        if (mmapptr == MAP_FAILED)
                vm_abort("gc_init: out of memory");
+#else
+       mmapptr = malloc(heapmaxsize);
+
+       if (mmapptr == NULL)
+               vm_abort("gc_init: out of memory");
+#endif
 
        mmapsize = heapmaxsize;
        mmaptop = (void *) ((ptrint) mmapptr + mmapsize);