Bladeren bron

SIMPLE_THREADS does not require malloc mutex protection

David Rose 18 jaren geleden
bovenliggende
commit
ab22feb406
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      dtool/LocalSetup.pp
  2. 1 1
      dtool/src/dtoolbase/dtoolbase.cxx

+ 1 - 1
dtool/LocalSetup.pp

@@ -499,7 +499,7 @@ $[cdefine GLOBAL_OPERATOR_NEW_EXCEPTIONS]
 #define USE_MEMORY_MALLOC
 #define USE_MEMORY_NOWRAPPERS
 #if $[ALTERNATIVE_MALLOC]
-  #if $[HAVE_THREADS]
+  #if $[and $[HAVE_THREADS], $[not $[SIMPLE_THREADS]]]
     // A fast thread-safe alternative implementation.
     #set USE_MEMORY_PTMALLOC2 1
   #else

+ 1 - 1
dtool/src/dtoolbase/dtoolbase.cxx

@@ -35,7 +35,7 @@ bool __tau_shutdown = false;
 
 #if defined(USE_MEMORY_DLMALLOC)
 
-#ifdef HAVE_THREADS
+#if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
 #error Cannot use dlmalloc library with threading enabled!
 #endif