kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Erwin Coumans 2006-02-17 20:18:49 +00:00
parent 69d00bccaa
commit 78942aa843
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
intern/guardedalloc/intern/mallocn.c
View File

@ -386,21 +386,28 @@ static void remlink(localListBase *listbase, void *vlink)
static void rem_memblock(MemHead *memh) static void rem_memblock(MemHead *memh)
{ {
remlink(membase,&memh->next); remlink(membase,&memh->next);
if (memh->prev){ if (memh->prev){
if (memh->next) MEMNEXT(memh->prev)->nextname = MEMNEXT(memh->next)->name; if (memh->next) MEMNEXT(memh->prev)->nextname =
else MEMNEXT(memh->prev)->nextname = 0; MEMNEXT(memh->next)->name;
} else MEMNEXT(memh->prev)->nextname = 0;
}
totblock--; totblock--;
mem_in_use -= memh->len; mem_in_use -= memh->len;
if(memh->mmap) {
mmap_in_use -= memh->len; #if defined(AMIGA) || defined(__BeOS) || defined(WIN32)
if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail))) free(memh);
printf("Couldn't unmap memory %s\n", memh->name); #else
}
else if(memh->mmap) {
free(memh); 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) static void MemorY_ErroR(const char *block, const char *error)