Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brad Lassey 2010-03-10 00:43:26 -05:00
parent 29d6c1315b
commit 369622eebe
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/Makefile.in
View File

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

4
build/wince/shunt/Makefile.in
View File

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

4
build/wince/shunt/include/mozce_shunt.h
View File

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