diff --git a/Makefile b/Makefile
index efd0231f..7c57002e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ CSERVICE_PATH ?= cservice
 
 SKYNET_BUILD_PATH ?= .
 
-CFLAGS = -g -O2 -Wall -I$(LUA_INC) $(MYCFLAGS)
+CFLAGS = -g -O2 -Wall -I$(LUA_INC) $(MYCFLAGS) $(SKYNET_DEFINES)
 
 # 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) $(SKYNET_DEFINES)
+	$(CC) $(CFLAGS) -o $@ $^ -Iskynet-src -I$(JEMALLOC_INC) $(LDFLAGS) $(EXPORT) $(SKYNET_LIBS) 
 
 $(LUA_CLIB_PATH) :
 	mkdir $(LUA_CLIB_PATH)
diff --git a/platform.mk b/platform.mk
index eddebad0..975cf293 100644
--- a/platform.mk
+++ b/platform.mk
@@ -28,10 +28,14 @@ freebsd : PLAT = freebsd
 
 macosx : SHARED := -fPIC -dynamiclib -Wl,-undefined,dynamic_lookup
 macosx : EXPORT :=
-macosx : MALLOC_STATICLIB :=
-macosx : SKYNET_DEFINES :=-DNOUSE_JEMALLOC
 macosx linux : SKYNET_LIBS += -ldl
 linux freebsd : SKYNET_LIBS += -lrt
 
+# Turn off jemalloc and malloc hook on macosx
+
+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/malloc_hook.c b/skynet-src/malloc_hook.c
index 2657f455..33dc5263 100644
--- a/skynet-src/malloc_hook.c
+++ b/skynet-src/malloc_hook.c
@@ -3,33 +3,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#ifdef __APPLE__
-#include <malloc/malloc.h>
-#define malloc_usable_size(ptr) malloc_size(ptr)
-#endif
-
-#ifdef __FreeBSD__
-#include <malloc_np.h>
-#endif
-
-#ifdef NOUSE_JEMALLOC
-
-#define je_malloc malloc
-#define je_free free
-#define je_calloc calloc
-#define je_realloc realloc
-#define je_malloc_usable_size malloc_usable_size
-
-#else
-
-#include "jemalloc.h"
-
-#endif
-
 #include "malloc_hook.h"
 #include "skynet.h"
 
-
 static size_t _used_memory = 0;
 static size_t _memory_block = 0;
 typedef struct _mem_data {
@@ -42,6 +18,11 @@ typedef struct _mem_data {
 
 static mem_data mem_stats[SLOT_SIZE];
 
+
+#ifndef NOUSE_JEMALLOC
+
+#include "jemalloc.h"
+
 static ssize_t*
 get_allocated_field(uint32_t handle) {
 	int h = (int)(handle & (SLOT_SIZE - 1));
@@ -111,37 +92,6 @@ static void malloc_oom(size_t size) {
 	abort();
 }
 
-size_t
-malloc_used_memory(void) {
-	return _used_memory;
-}
-
-size_t
-malloc_memory_block(void) {
-	return _memory_block;
-}
-
-#ifdef NOUSE_JEMALLOC
-
-void 
-memory_info_dump(void) {
-	skynet_error(NULL, "No jemalloc");
-}
-
-size_t 
-mallctl_int64(const char* name, size_t* newval) {
-	skynet_error(NULL, "No jemalloc : mallctl_int64 %s.", name);
-	return 0;
-}
-
-int 
-mallctl_opt(const char* name, int* newval) {
-	skynet_error(NULL, "No jemalloc : mallctl_opt %s.", name);
-	return 0;
-}
-
-#else
-
 void 
 memory_info_dump(void) {
 	je_malloc_stats_print(0,0,0);
@@ -178,23 +128,6 @@ mallctl_opt(const char* name, int* newval) {
 	return v;
 }
 
-#endif
-
-void
-dump_c_mem() {
-	int i;
-	size_t total = 0;
-	printf("dump all service mem:\n");
-	for(i=0; i<SLOT_SIZE; i++) {
-		mem_data* data = &mem_stats[i];
-		if(data->handle != 0 && data->allocated != 0) {
-			total += data->allocated;
-			printf("0x%x -> %zdkb\n", data->handle, data->allocated >> 10);
-		}
-	}
-	printf("+total: %zdkb\n",total >> 10);
-}
-
 // hook : malloc, realloc, free, calloc
 
 void *
@@ -228,6 +161,52 @@ skynet_calloc(size_t nmemb,size_t size) {
 	return fill_prefix(ptr);
 }
 
+#else
+
+void 
+memory_info_dump(void) {
+	skynet_error(NULL, "No jemalloc");
+}
+
+size_t 
+mallctl_int64(const char* name, size_t* newval) {
+	skynet_error(NULL, "No jemalloc : mallctl_int64 %s.", name);
+	return 0;
+}
+
+int 
+mallctl_opt(const char* name, int* newval) {
+	skynet_error(NULL, "No jemalloc : mallctl_opt %s.", name);
+	return 0;
+}
+
+#endif
+
+size_t
+malloc_used_memory(void) {
+	return _used_memory;
+}
+
+size_t
+malloc_memory_block(void) {
+	return _memory_block;
+}
+
+void
+dump_c_mem() {
+	int i;
+	size_t total = 0;
+	printf("dump all service mem:\n");
+	for(i=0; i<SLOT_SIZE; i++) {
+		mem_data* data = &mem_stats[i];
+		if(data->handle != 0 && data->allocated != 0) {
+			total += data->allocated;
+			printf("0x%x -> %zdkb\n", data->handle, data->allocated >> 10);
+		}
+	}
+	printf("+total: %zdkb\n",total >> 10);
+}
+
 char *
 skynet_strdup(const char *str) {
 	size_t sz = strlen(str);
diff --git a/skynet-src/skynet_malloc.h b/skynet-src/skynet_malloc.h
index 0d1b9980..1b3b94d3 100644
--- a/skynet-src/skynet_malloc.h
+++ b/skynet-src/skynet_malloc.h
@@ -3,12 +3,12 @@
 
 #include <stddef.h>
 
-#ifdef SKYNET_MALLOC_RENAME
+#ifdef NOUSE_JEMALLOC
 
-#define malloc skynet_malloc
-#define calloc skynet_calloc
-#define realloc skynet_realloc
-#define free skynet_free
+#define skynet_malloc malloc
+#define skynet_calloc calloc
+#define skynet_realloc realloc
+#define skynet_free free
 
 #endif