diff options
author | Dan HorĂ¡k <dan@danny.cz> | 2014-10-14 18:11:20 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-14 18:11:20 +0400 |
commit | c86c9297dc91056fb8f17e3770e259853b60f310 (patch) | |
tree | 957ef945fe441fc2965da02e07fb927df6b536f8 /intern/guardedalloc/MEM_guardedalloc.h | |
parent | b171fd7483c54675096b7a16c7197bc89aa9f112 (diff) |
Fix inconsistent types in guardealloc
This basically fixes mix of size_t and uintptr_t usages which might be different size.
Diffstat (limited to 'intern/guardedalloc/MEM_guardedalloc.h')
-rw-r--r-- | intern/guardedalloc/MEM_guardedalloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 3b56362e3d6..f0a69f99385 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -165,9 +165,9 @@ extern "C" { * Memory usage stats * - MEM_get_memory_in_use is all memory * - MEM_get_mapped_memory_in_use is a subset of all memory */ - extern uintptr_t (*MEM_get_memory_in_use)(void); + extern size_t (*MEM_get_memory_in_use)(void); /** Get mapped memory usage. */ - extern uintptr_t (*MEM_get_mapped_memory_in_use)(void); + extern size_t (*MEM_get_mapped_memory_in_use)(void); /** Get amount of memory blocks in use. */ extern unsigned int (*MEM_get_memory_blocks_in_use)(void); |