Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ifdef enclosure of doug lea malloc

This commit is contained in:
Enno Rehling 2005-06-12 10:56:18 +00:00
parent 70413bb43c
commit 71dee49bbb
5 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Jamrules
View File

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

3
src/common/kernel/unit.c
View File

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

2
src/common/util/Jamfile
View File

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

6
src/eressea/server.cpp
View File

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