mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 02:42:49 -04:00
SIMPLE_THREADS does not require malloc mutex protection
This commit is contained in:
parent
4d9a1500dd
commit
ab22feb406
@ -499,7 +499,7 @@ $[cdefine GLOBAL_OPERATOR_NEW_EXCEPTIONS]
|
|||||||
#define USE_MEMORY_MALLOC
|
#define USE_MEMORY_MALLOC
|
||||||
#define USE_MEMORY_NOWRAPPERS
|
#define USE_MEMORY_NOWRAPPERS
|
||||||
#if $[ALTERNATIVE_MALLOC]
|
#if $[ALTERNATIVE_MALLOC]
|
||||||
#if $[HAVE_THREADS]
|
#if $[and $[HAVE_THREADS], $[not $[SIMPLE_THREADS]]]
|
||||||
// A fast thread-safe alternative implementation.
|
// A fast thread-safe alternative implementation.
|
||||||
#set USE_MEMORY_PTMALLOC2 1
|
#set USE_MEMORY_PTMALLOC2 1
|
||||||
#else
|
#else
|
||||||
|
@ -35,7 +35,7 @@ bool __tau_shutdown = false;
|
|||||||
|
|
||||||
#if defined(USE_MEMORY_DLMALLOC)
|
#if defined(USE_MEMORY_DLMALLOC)
|
||||||
|
|
||||||
#ifdef HAVE_THREADS
|
#if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
|
||||||
#error Cannot use dlmalloc library with threading enabled!
|
#error Cannot use dlmalloc library with threading enabled!
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user