ifdef enclosure of doug lea malloc

src/Jamrules

@@ -5,6 +5,11 @@ CC = gcc ;
 
 LINKFLAGS += -rdynamic ;
 
+if $(MSPACES) {
+  CCFLAGS += -DMSPACES ;
+  C++FLAGS += -DMSPACES ;
+}
+
 if ! $(HAVE_LUA) {
   HAVE_LUA = 1 ;
 }

src/common/kernel/unit.c

@@ -40,7 +40,7 @@
 #include <attributes/moved.h>
 
 /* util includes */
-#include <base36.h>
+#include <util/base36.h>
 #include <event.h>
 #include <goodies.h>
 #include <resolve.h>
@@ -56,7 +56,6 @@
 #define FIND_FOREIGN_TEMP
 
 int demonfix = 0;
-/* ------------------------------------------------------------- */
 
 const unit *
 u_peasants(void)

src/common/util/Jamfile

@@ -9,7 +9,7 @@ SEARCH_SOURCE +=
  [ FDirName $(SUBDIR) dl ] ;
 
 SOURCES =
- #<dl>malloc.c
+ <dl>malloc.c
  attrib.c
  base36.c
  command.c

src/eressea/server.cpp

@@ -87,7 +87,9 @@
 #include <util/log.h>
 #include <util/rand.h>
 #include <util/sql.h>
+#ifdef MSPACES
 # include <util/dl/malloc.h>
+#endif
 
 /* lua includes */
 #include "lua/bindings.h"
@@ -701,7 +703,9 @@ main(int argc, char *argv[])
     }
 #endif
   }
+#ifdef MSPACES
   malloc_stats();
+#endif
 #ifdef CLEANUP_CODE
   game_done();
 #endif