follow up to bug winmo_xmalloc, removing circular dependency r=dougt

build/Makefile.in

@@ -56,9 +56,16 @@ endif
 ifdef WINCE
 # We need jemalloc built before the shunt
 ifdef MOZ_MEMORY
-DIRS += wince/tools $(DEPTH)/memory/jemalloc $(DEPTH)/memory/mozalloc wince/shunt
+DIRS += wince/tools \
+	$(DEPTH)/memory/jemalloc \
+	wince/shunt \
+	$(DEPTH)/memory/mozalloc \
+	$(NULL)
 else
-DIRS += wince/tools $(DEPTH)/memory/mozalloc wince/shunt
+DIRS += wince/tools \
+	wince/shunt \
+	$(DEPTH)/memory/mozalloc \
+	$(NULL)
 endif
 endif
 

build/wince/shunt/Makefile.in

@@ -83,7 +83,7 @@ endif
 
 DEFFILE = mozce_shunt.def
 
-OS_LIBS += $(call EXPAND_LIBNAME, libcmt)
+OS_LIBS = $(call EXPAND_LIBNAME, libcmt)
 
 CPPSRCS = \
 	shunt.cpp \
@@ -92,7 +92,7 @@ CPPSRCS = \
 	memory.cpp \
 	$(NULL)
 
-DEFINES += -DMOZCE_SHUNT_EXPORTS
+DEFINES += -DMOZCE_SHUNT_EXPORTS -DIN_SHUNT
 
 include $(topsrcdir)/config/rules.mk
 

build/wince/shunt/include/mozce_shunt.h

@@ -99,7 +99,7 @@ inline void *operator new[](size_t, void *p) {
   return p;
 }
 
-
+#ifndef IN_SHUNT
 // for Gecko, include infallible mozalloc allocators.  elsewhere, define
 // operator new() normally.
 // NB: this include guard needs to be kept in sync with the one in nscore.h
@@ -121,7 +121,7 @@ inline void operator delete[](void* ptr) throw() {
 }
 
 #endif  // if defined(_MOZILLA_CONFIG_H_)
-
+#endif
 
 extern "C" {
 #endif