From 6c6bd6dd00c71813ccb28801ec4a2ce10f3274ae Mon Sep 17 00:00:00 2001 From: "shaver%mozilla.org" Date: Fri, 17 Jun 2005 12:07:48 +0000 Subject: [PATCH] Bug 295659: include nsRect.cpp in xmlextras to cope with compilers which expand inlines in nsRect too aggressively. (nsRect is found via nsGUIEvent.h included from nsXMLHttpRequest.cpp.) r=bsmedberg, a=asa. --- extensions/xmlextras/base/src/Makefile.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/extensions/xmlextras/base/src/Makefile.in b/extensions/xmlextras/base/src/Makefile.in index 10977b49895..a5ba0a3a36e 100644 --- a/extensions/xmlextras/base/src/Makefile.in +++ b/extensions/xmlextras/base/src/Makefile.in @@ -69,8 +69,22 @@ CPPSRCS = \ nsLoadListenerProxy.cpp \ $(NULL) +# See bug 295659 +DEFINES += -D_IMPL_NS_GFX +CPPSRCS += nsRect.cpp + # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk + +# Make sure that we have nsRect built in, because some compilers like to +# aggressively expand some inlines we get via nsGUIEvent.h, and then we +# lose when linking during a (transitive) XPI_PKGNAME build driven by a +# static-app master build. +# +# See bug 295659. +export:: + $(NSINSTALL) $(topsrcdir)/gfx/src/nsRect.cpp . +