diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-04-29 23:41:12 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-04-29 23:41:12 +0400 |
| commit | d2f5a60ca2ee3d8cc9dfe1dbb3a2e7770a2b589c (patch) | |
| tree | f667c2eeb6bd84355f33908697fd7deeffcfdec2 /intern/guardedalloc | |
| parent | cbc2a71128156d2caac653df5cb021e819fd159a (diff) | |
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 ‘MEM_mapallocN’)
Diffstat (limited to 'intern/guardedalloc')
| -rw-r--r-- | intern/guardedalloc/MEM_guardedalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |