Revision: 28513
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28513
Author: jesterking
Date: 2010-04-29 21:41:12 +0200 (Thu, 29 Apr 2010)
Log Message:
-----------
Amendment to r28508 (Make Blender malloc be 64 bit ready)
- one function missed in header causes compile problems
(intern/guardedalloc/intern/mallocn.c:352: error: conflicting types for
?\226?\128?\152MEM_mapallocN?\226?\128?\153)
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
Modified: trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2010-04-29
18:53:01 UTC (rev 28512)
+++ trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2010-04-29
19:41:12 UTC (rev 28513)
@@ -105,7 +105,7 @@
/** 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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
