diff options
| author | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
| commit | 7246c387435769a169ac24c91434c615df6434b4 (patch) | |
| tree | 61842e3e0ce85e80720fdd7476d44d2e629f59fd /intern/guardedalloc/intern/mallocn.c | |
| parent | c5f55d17096d373791363e46004176e3f7f7ae52 (diff) | |
| parent | 0b4bd3ddc016298e868169a541cf6c132b10c587 (diff) | |
Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view
Diffstat (limited to 'intern/guardedalloc/intern/mallocn.c')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 63f06ced31d..984e641e7c1 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -43,7 +43,7 @@ void (*MEM_set_error_callback)(void (*func)(const char *)) = MEM_lockfree_set_er bool (*MEM_consistency_check)(void) = MEM_lockfree_consistency_check; void (*MEM_set_memory_debug)(void) = MEM_lockfree_set_memory_debug; size_t (*MEM_get_memory_in_use)(void) = MEM_lockfree_get_memory_in_use; -unsigned int (*MEM_get_memory_blocks_in_use)(void) = MEM_lockfree_get_memory_blocks_in_use; +uint (*MEM_get_memory_blocks_in_use)(void) = MEM_lockfree_get_memory_blocks_in_use; void (*MEM_reset_peak_memory)(void) = MEM_lockfree_reset_peak_memory; size_t (*MEM_get_peak_memory)(void) = MEM_lockfree_get_peak_memory; |