Bladeren bron

fix ptmalloc2 for windows again

David Rose 20 jaren geleden
bovenliggende
commit
c398f10d7b
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      dtool/src/dtoolbase/Sources.pp
  2. 1 1
      dtool/src/dtoolbase/dtoolbase.cxx

+ 1 - 1
dtool/src/dtoolbase/Sources.pp

@@ -11,7 +11,7 @@
     stl_compares.I stl_compares.h \
     stl_compares.I stl_compares.h \
     pallocator.T pallocator.h \
     pallocator.T pallocator.h \
     pdeque.h plist.h pmap.h pset.h pvector.h \
     pdeque.h plist.h pmap.h pset.h pvector.h \
-    dlmalloc.c ptmalloc2_smp.c
+    dlmalloc.c
 
 
   #define INSTALL_HEADERS \
   #define INSTALL_HEADERS \
     cmath.I cmath.h \
     cmath.I cmath.h \

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

@@ -72,7 +72,7 @@ void (*global_operator_delete)(void *ptr) = &default_operator_delete;
 
 
 #define USE_DL_PREFIX 1
 #define USE_DL_PREFIX 1
 #define NO_MALLINFO 1
 #define NO_MALLINFO 1
-#include "dlmalloc.h"
+#include "ptmalloc2_smp.c"
 
 
 void *default_operator_new(size_t size) {
 void *default_operator_new(size_t size) {
   void *ptr = dlmalloc(size);
   void *ptr = dlmalloc(size);