Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor

Conflicts:
	source/blender/nodes/texture/nodes/node_texture_math.c

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;