[Bf-blender-cvs] [d21737189e6] sculpt-dev: Sculpt: fix gcc compiler error
Joseph Eagar
noreply at git.blender.org
Fri Oct 22 19:48:50 CEST 2021
Commit: d21737189e64e9b134fd44e181af9271c7f612ed
Author: Joseph Eagar
Date: Fri Oct 22 10:48:34 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rBd21737189e64e9b134fd44e181af9271c7f612ed
Sculpt: fix gcc compiler error
===================================================================
M intern/guardedalloc/intern/mallocn.c
===================================================================
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index 1902d10f494..16c8b5dc563 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -40,7 +40,7 @@ const char *malloc_conf = "background_thread:true,dirty_decay_ms:4000";
size_t (*MEM_allocN_len)(const void *vmemh) = MEM_lockfree_allocN_len;
void (*MEM_freeN)(void *vmemh) = MEM_lockfree_freeN;
void *(*MEM_dupallocN)(const void *vmemh) = MEM_lockfree_dupallocN;
-void *(*MEM_dupallocN_id)(const void *vmemh) = MEM_lockfree_dupallocN_id;
+void *(*MEM_dupallocN_id)(const void *vmemh, const char *str) = MEM_lockfree_dupallocN_id;
void *(*MEM_reallocN_id)(void *vmemh, size_t len, const char *str) = MEM_lockfree_reallocN_id;
void *(*MEM_recallocN_id)(void *vmemh, size_t len, const char *str) = MEM_lockfree_recallocN_id;
void *(*MEM_callocN)(size_t len, const char *str) = MEM_lockfree_callocN;
More information about the Bf-blender-cvs
mailing list