diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-08-18 17:06:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-08-18 17:06:33 +0400 |
commit | d535770c180ef92c69f65e9a228e8c4a99398c53 (patch) | |
tree | a2fcb97fd690c7d4d808f0c8d73f7a1e41b890bc | |
parent | e174b34eef76cf0b1b3bd7f0a7d355a0dea39413 (diff) |
small error, stopped apricot building on linux-32bit
-rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index b89ef3d3c69..7bdca7339fc 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -696,12 +696,12 @@ static const char *check_memlist(MemHead *memh) return(name); } -unsigned long MEM_get_memory_in_use(void) +uintptr_t MEM_get_memory_in_use(void) { return mem_in_use; } -unsigned long MEM_get_mapped_memory_in_use(void) +uintptr_t MEM_get_mapped_memory_in_use(void) { return mmap_in_use; } |