Added support for threadsafe MEM_mallocN/MEM_freeN in the guardedalloc

module itself, replacing the special MEM_mallocT/MEM_freeT functions.
Mutex locking is only enabled when threads are running.

There was no good reason to have these separate, it just led to ugly
hacks when calling functions with non-threadsafe malloc from threads.

1 files changed, 5 insertions, 4 deletions

diff --git a/source/blender/blenpluginapi/intern/pluginapi.c b/source/blender/blenpluginapi/intern/pluginapi.c
index 872c8c55141..43c4727cea1 100644
--- a/source/blender/blenpluginapi/intern/pluginapi.c
+++ b/source/blender/blenpluginapi/intern/pluginapi.c
@@ -76,20 +76,21 @@ LIBEXPORT short freeN(void *vmemh)
 	return MEM_freeN(vmemh);
 }
 
-
+/* these are not needed anymore, mallocN/callocN/freeN is now threadsafe */
 LIBEXPORT void *mallocT(int len, char *str)
 {
-	return MEM_mallocT(len, str);
+	return MEM_mallocN(len, str);
 }
 
 LIBEXPORT void *callocT(int len, char *str)
 {
-	return MEM_callocT(len, str);
+	return MEM_callocN(len, str);
 }
 
 LIBEXPORT void freeT(void *vmemh)
 {
-	return MEM_freeT(vmemh);
+	MEM_freeN(vmemh);
+	return;
 }