From d2f5a60ca2ee3d8cc9dfe1dbb3a2e7770a2b589c Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Thu, 29 Apr 2010 19:41:12 +0000 Subject: =?UTF-8?q?Amendment=20to=20r28508=20(Make=20Blender=20malloc=20be?= =?UTF-8?q?=2064=20bit=20ready)=20-=20one=20function=20missed=20in=20heade?= =?UTF-8?q?r=20causes=20compile=20problems=20(intern/guardedalloc/intern/m?= =?UTF-8?q?allocn.c:352:=20error:=20conflicting=20types=20for=20=E2=80=98M?= =?UTF-8?q?EM=5FmapallocN=E2=80=99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- intern/guardedalloc/MEM_guardedalloc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/guardedalloc') diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 1d8f42a2707..edc02cee403 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -105,7 +105,7 @@ extern "C" { /** Same as callocN, clears memory and uses mmap (disk cached) if supported. Can be free'd with MEM_freeN as usual. * */ - void *MEM_mapallocN(unsigned int len, const char * str); + void *MEM_mapallocN(size_t len, const char * str); /** Print a list of the names and sizes of all allocated memory * blocks. as a python dict for easy investigation */ -- cgit v1.2.3