diff --git a/Makefile b/Makefile index fbb9447a..f6f12675 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CSERVICE_PATH ?= cservice SKYNET_BUILD_PATH ?= . -CFLAGS = -g -O2 -Wall -I$(LUA_INC) $(MYCFLAGS) $(SKYNET_DEFINES) +CFLAGS = -g -O2 -Wall -I$(LUA_INC) $(MYCFLAGS) # lua @@ -54,7 +54,7 @@ all : \ $(foreach v, $(LUA_CLIB), $(LUA_CLIB_PATH)/$(v).so) $(SKYNET_BUILD_PATH)/skynet : $(foreach v, $(SKYNET_SRC), skynet-src/$(v)) $(LUA_LIB) $(MALLOC_STATICLIB) - $(CC) $(CFLAGS) -o $@ $^ -Iskynet-src -I$(JEMALLOC_INC) $(LDFLAGS) $(EXPORT) $(SKYNET_LIBS) + $(CC) $(CFLAGS) -o $@ $^ -Iskynet-src -I$(JEMALLOC_INC) $(LDFLAGS) $(EXPORT) $(SKYNET_LIBS) $(SKYNET_DEFINES) $(LUA_CLIB_PATH) : mkdir $(LUA_CLIB_PATH) diff --git a/platform.mk b/platform.mk index 975cf293..a112f0f2 100644 --- a/platform.mk +++ b/platform.mk @@ -36,6 +36,5 @@ linux freebsd : SKYNET_LIBS += -lrt macosx : MALLOC_STATICLIB := macosx : SKYNET_DEFINES :=-DNOUSE_JEMALLOC - linux macosx freebsd : $(MAKE) all PLAT=$@ SKYNET_LIBS="$(SKYNET_LIBS)" SHARED="$(SHARED)" EXPORT="$(EXPORT)" MALLOC_STATICLIB="$(MALLOC_STATICLIB)" SKYNET_DEFINES="$(SKYNET_DEFINES)" diff --git a/skynet-src/skynet_malloc.h b/skynet-src/skynet_malloc.h index 1b3b94d3..f7e4337f 100644 --- a/skynet-src/skynet_malloc.h +++ b/skynet-src/skynet_malloc.h @@ -3,15 +3,11 @@ #include -#ifdef NOUSE_JEMALLOC - #define skynet_malloc malloc #define skynet_calloc calloc #define skynet_realloc realloc #define skynet_free free -#endif - void * skynet_malloc(size_t sz); void * skynet_calloc(size_t nmemb,size_t size); void * skynet_realloc(void *ptr, size_t size);