diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /intern/guardedalloc/intern/mallocn_guarded_impl.c | |
parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'intern/guardedalloc/intern/mallocn_guarded_impl.c')
-rw-r--r-- | intern/guardedalloc/intern/mallocn_guarded_impl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c index 10781a9cc54..ecc54882447 100644 --- a/intern/guardedalloc/intern/mallocn_guarded_impl.c +++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c @@ -1151,9 +1151,9 @@ void MEM_guarded_reset_peak_memory(void) mem_unlock_thread(); } -uintptr_t MEM_guarded_get_memory_in_use(void) +size_t MEM_guarded_get_memory_in_use(void) { - uintptr_t _mem_in_use; + size_t _mem_in_use; mem_lock_thread(); _mem_in_use = mem_in_use; @@ -1162,9 +1162,9 @@ uintptr_t MEM_guarded_get_memory_in_use(void) return _mem_in_use; } -uintptr_t MEM_guarded_get_mapped_memory_in_use(void) +size_t MEM_guarded_get_mapped_memory_in_use(void) { - uintptr_t _mmap_in_use; + size_t _mmap_in_use; mem_lock_thread(); _mmap_in_use = mmap_in_use; |