temporarily fix from Johnny Matthews committed, win32 doesn't have munmap. Someone can worry about a future mmap-like implementation.

1 files changed, 22 insertions, 15 deletions

diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index 763cb655c8d..e682f17a386 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -386,21 +386,28 @@ static void remlink(localListBase *listbase, void *vlink)
 
 static void rem_memblock(MemHead *memh)
 {
-	remlink(membase,&memh->next);
-	if (memh->prev){
-		if (memh->next) MEMNEXT(memh->prev)->nextname = MEMNEXT(memh->next)->name;
-		else MEMNEXT(memh->prev)->nextname = 0;
-	}
-
-	totblock--;
-	mem_in_use -= memh->len;
-	if(memh->mmap) {
-		mmap_in_use -= memh->len;
-		if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail)))
-			printf("Couldn't unmap memory %s\n", memh->name);
-	}
-	else	
-		free(memh);
+    remlink(membase,&memh->next);
+    if (memh->prev){
+        if (memh->next) MEMNEXT(memh->prev)->nextname = 
+MEMNEXT(memh->next)->name;
+        else MEMNEXT(memh->prev)->nextname = 0;
+    }
+
+    totblock--;
+    mem_in_use -= memh->len;
+   
+#if defined(AMIGA) || defined(__BeOS) || defined(WIN32)
+    free(memh);
+#else   
+   
+    if(memh->mmap) {
+        mmap_in_use -= memh->len;
+        if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail)))
+            printf("Couldn't unmap memory %s\n", memh->name);
+    }
+    else   
+        free(memh);
+#endif
 }
 
 static void MemorY_ErroR(const char *block, const char *error)