Bug 892861 - Remove useless -D flags 'IMPL_THEBES,_IMPL_NS_GFX,...'. r=glandium
authorBenoit Girard <b56girard@gmail.com>
Fri, 12 Jul 2013 08:56:54 -0400
changeset 138293 e6ebdb6069c7542f779280487e3e6a7ee76d8cb1
parent 138292 be42574c64164534a812b532af737c9b13659acd
child 138294 31342704016ea7733b496989284073abd615ed91
push id30921
push userb56girard@gmail.com
push dateFri, 12 Jul 2013 13:04:04 +0000
treeherdermozilla-inbound@e6ebdb6069c7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs892861
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 892861 - Remove useless -D flags 'IMPL_THEBES,_IMPL_NS_GFX,...'. r=glandium
config/config.mk
gfx/layers/Makefile.in
gfx/src/Makefile.in
gfx/thebes/Makefile.in
gfx/ycbcr/Makefile.in
js/src/config/config.mk
netwerk/Makefile.in
netwerk/base/Makefile.in
netwerk/base/public/Makefile.in
netwerk/base/public/nsChannelProperties.h
netwerk/base/src/Makefile.in
netwerk/build/Makefile.in
netwerk/cache/Makefile.in
netwerk/cookie/Makefile.in
netwerk/dash/Makefile.in
netwerk/dash/mpd/Makefile.in
netwerk/dns/Makefile.in
netwerk/mime/Makefile.in
netwerk/protocol/Makefile.in
netwerk/protocol/about/Makefile.in
netwerk/protocol/device/Makefile.in
netwerk/protocol/file/Makefile.in
netwerk/protocol/ftp/Makefile.in
netwerk/protocol/http/Makefile.in
netwerk/protocol/res/Makefile.in
netwerk/protocol/websocket/Makefile.in
netwerk/protocol/wyciwyg/Makefile.in
netwerk/sctp/datachannel/Makefile.in
netwerk/sctp/src/Makefile.in
netwerk/socket/Makefile.in
netwerk/srtp/src/Makefile.in
netwerk/streamconv/Makefile.in
netwerk/streamconv/converters/Makefile.in
netwerk/streamconv/public/Makefile.in
netwerk/streamconv/src/Makefile.in
netwerk/system/android/Makefile.in
netwerk/system/maemo/Makefile.in
netwerk/system/qt/Makefile.in
netwerk/system/win32/Makefile.in
netwerk/wifi/Makefile.in
toolkit/library/Makefile.in
toolkit/profile/Makefile.in
toolkit/xre/Makefile.in
widget/android/Makefile.in
widget/gonk/Makefile.in
widget/os2/Makefile.in
widget/qt/Makefile.in
widget/shared/Makefile.in
widget/windows/Makefile.in
widget/windows/winrt/Makefile.in
widget/xpwidgets/Makefile.in
xpcom/base/Makefile.in
xpcom/base/nscore.h
xpcom/build/Makefile.in
xpcom/build/xrecore.h
xpcom/components/Makefile.in
xpcom/ds/Makefile.in
xpcom/ds/nsWindowsRegKey.h
xpcom/io/Makefile.in
xpcom/reflect/xptcall/src/Makefile.in
xpcom/reflect/xptcall/src/md/os2/Makefile.in
xpcom/reflect/xptcall/src/md/unix/Makefile.in
xpcom/reflect/xptcall/src/md/win32/Makefile.in
xpcom/reflect/xptinfo/src/Makefile.in
xpcom/string/src/Makefile.in
xpcom/threads/Makefile.in
xpcom/typelib/xpt/src/Makefile.in
xpcom/typelib/xpt/tests/Makefile.in
--- a/config/config.mk
+++ b/config/config.mk
@@ -319,24 +319,17 @@ endif # NO_PROFILE_GUIDED_OPTIMIZE
 ifneq (,$(MOZILLA_INTERNAL_API)$(LIBXUL_LIBRARY))
 DEFINES += -DMOZILLA_INTERNAL_API
 endif
 
 # Force XPCOM/widget/gfx methods to be _declspec(dllexport) when we're
 # building libxul libraries
 ifdef LIBXUL_LIBRARY
 DEFINES += \
-		-D_IMPL_NS_COM \
-		-DEXPORT_XPT_API \
-		-DEXPORT_XPTC_API \
-		-D_IMPL_NS_GFX \
-		-D_IMPL_NS_WIDGET \
-		-DIMPL_XREAPI \
-		-DIMPL_NS_NET \
-		-DIMPL_THEBES \
+	  -DIMPL_LIBXUL \
 		$(NULL)
 
 ifndef JS_SHARED_LIBRARY
 DEFINES += -DSTATIC_EXPORTABLE_JS_API
 endif
 endif
 
 # Flags passed to JarMaker.py
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -19,17 +19,16 @@ VPATH       = \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = layers
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
-DEFINES += -DIMPL_THEBES
 ifdef MOZ_DEBUG
 DEFINES += -DD3D_DEBUG_INFO
 endif
 
 ifdef MOZ_ENABLE_D3D10_LAYER
 DEFINES	+= -DMOZ_ENABLE_D3D10_LAYER
 endif
 
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -26,9 +26,8 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CXXFLAGS += $(CAIRO_FT_CFLAGS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 CXXFLAGS += $(MOZ_QT_CFLAGS)
 endif
 
-DEFINES += -D_IMPL_NS_GFX
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -48,17 +48,16 @@ endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 # This is set for "normal Android", that is, when Gecko is running on
 # top of the android java runtime.
 DEFINES +=	-DMOZ_USING_ANDROID_JAVA_WIDGETS
 endif
 
 DEFINES += \
-	-DIMPL_THEBES \
 	-DHB_DONT_DEFINE_STDINT \
 	-DMOZ_OTS_REPORT_ERRORS \
 	-DGRAPHITE2_STATIC \
 	$(NULL)
 
 ifeq (WINNT,$(OS_TARGET))
 DEFINES += -DOTS_DLL
 endif
--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@@ -3,18 +3,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
-DEFINES += -D_IMPL_NS_GFX
-
 include $(topsrcdir)/config/rules.mk
 
 # These files use MMX and SSE2 intrinsics, so they need special compile flags
 # on some compilers.
 ifneq (,$(INTEL_ARCHITECTURE))
 ifdef GNU_CC
 yuv_convert_mmx.$(OBJ_SUFFIX): CXXFLAGS += -mmmx
 yuv_convert_sse2.$(OBJ_SUFFIX): CXXFLAGS += -msse2
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -319,24 +319,17 @@ endif # NO_PROFILE_GUIDED_OPTIMIZE
 ifneq (,$(MOZILLA_INTERNAL_API)$(LIBXUL_LIBRARY))
 DEFINES += -DMOZILLA_INTERNAL_API
 endif
 
 # Force XPCOM/widget/gfx methods to be _declspec(dllexport) when we're
 # building libxul libraries
 ifdef LIBXUL_LIBRARY
 DEFINES += \
-		-D_IMPL_NS_COM \
-		-DEXPORT_XPT_API \
-		-DEXPORT_XPTC_API \
-		-D_IMPL_NS_GFX \
-		-D_IMPL_NS_WIDGET \
-		-DIMPL_XREAPI \
-		-DIMPL_NS_NET \
-		-DIMPL_THEBES \
+	  -DIMPL_LIBXUL \
 		$(NULL)
 
 ifndef JS_SHARED_LIBRARY
 DEFINES += -DSTATIC_EXPORTABLE_JS_API
 endif
 endif
 
 # Flags passed to JarMaker.py
--- a/netwerk/Makefile.in
+++ b/netwerk/Makefile.in
@@ -6,9 +6,8 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/base/Makefile.in
+++ b/netwerk/base/Makefile.in
@@ -6,9 +6,8 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/base/public/Makefile.in
+++ b/netwerk/base/public/Makefile.in
@@ -9,9 +9,9 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
+DEFINES += -DIMPL_LIBXUL
--- a/netwerk/base/public/nsChannelProperties.h
+++ b/netwerk/base/public/nsChannelProperties.h
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsChannelProperties_h__
 #define nsChannelProperties_h__
 
 #include "nsStringGlue.h"
-#ifdef IMPL_NS_NET
+#ifdef IMPL_LIBXUL
 #include "nsNetStrings.h"
 #endif
 
 /**
  * @file
  * This file contains constants for properties channels can expose.
  * They can be accessed by using QueryInterface to access the nsIPropertyBag
  * or nsIPropertyBag2 interface on a channel and reading the value.
@@ -20,16 +20,16 @@
 
 /**
  * Exists to allow content policy mechanism to function properly during channel
  * redirects.  Contains security contextual information about the load.
  * Type: nsIChannelPolicy
  */
 #define NS_CHANNEL_PROP_CHANNEL_POLICY_STR "channel-policy"
 
-#ifdef IMPL_NS_NET
+#ifdef IMPL_LIBXUL
 #define NS_CHANNEL_PROP_CHANNEL_POLICY gNetStrings->kChannelPolicy
 #else
 #define NS_CHANNEL_PROP_CHANNEL_POLICY \
   NS_LITERAL_STRING(NS_CHANNEL_PROP_CHANNEL_POLICY_STR)
 #endif
 
 #endif
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -32,13 +32,11 @@ include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_TARGET),Android)
 # this works around a "branch out of range" error when compiling this file opt
 nsURLParsers.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS=
 endif
 
-DEFINES += -DIMPL_NS_NET
-
 ifdef MOZ_ENABLE_LIBCONIC
 	OS_INCLUDES += $(GLIB_CFLAGS) $(LIBCONIC_CFLAGS)
 endif
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -121,9 +121,8 @@ SHARED_LIBRARY_LIBS += \
 LOCAL_INCLUDES += -I$(srcdir)/../wifi
 
 endif
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@@ -15,9 +15,8 @@ LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@@ -25,9 +25,8 @@ LOCAL_INCLUDES	= \
 
 endif
 
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/dash/Makefile.in
+++ b/netwerk/dash/Makefile.in
@@ -12,9 +12,8 @@ DEPTH     := @DEPTH@
 topsrcdir := @top_srcdir@
 srcdir    := @srcdir@
 VPATH     := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/dash/mpd/Makefile.in
+++ b/netwerk/dash/mpd/Makefile.in
@@ -20,9 +20,8 @@ LIBXUL_LIBRARY := 1
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/html/content/public \
   -I$(topsrcdir)/content/html/content/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@@ -23,17 +23,17 @@ DISABLED_CSRCS = \
 # need to include etld_data.inc
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base/src \
   -I. \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET \
+DEFINES += \
            -DHB_DONT_DEFINE_STDINT \
            $(NULL)
 
 # Generate the include file containing compact, static definitions
 # for effective TLD data.
 nsEffectiveTLDService.$(OBJ_SUFFIX): etld_data.inc
 nsEffectiveTLDService.h: etld_data.inc
 
--- a/netwerk/mime/Makefile.in
+++ b/netwerk/mime/Makefile.in
@@ -12,10 +12,8 @@ FAIL_ON_WARNINGS := 1
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
-
--- a/netwerk/protocol/Makefile.in
+++ b/netwerk/protocol/Makefile.in
@@ -6,9 +6,8 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@@ -17,9 +17,8 @@ LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/protocol/device/Makefile.in
+++ b/netwerk/protocol/device/Makefile.in
@@ -15,9 +15,8 @@ LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \
                  $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/protocol/file/Makefile.in
+++ b/netwerk/protocol/file/Makefile.in
@@ -16,10 +16,8 @@ LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
-
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@@ -27,9 +27,8 @@ include $(topsrcdir)/config/rules.mk
 ifeq ($(OS_ARCH),WINNT)
 ifndef MOZ_DEBUG
 ifndef NO_LOGGING
 DEFINES += -DFORCE_PR_LOG
 endif
 endif
 endif # WINNT
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@@ -21,10 +21,8 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
-
--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@@ -18,10 +18,8 @@ FAIL_ON_WARNINGS = 1
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/netwerk/base/src \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
-
--- a/netwerk/protocol/websocket/Makefile.in
+++ b/netwerk/protocol/websocket/Makefile.in
@@ -20,9 +20,8 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@@ -16,10 +16,8 @@ FAIL_ON_WARNINGS = 1
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
-
--- a/netwerk/sctp/datachannel/Makefile.in
+++ b/netwerk/sctp/datachannel/Makefile.in
@@ -38,9 +38,8 @@ else
 DEFINES += -D__Userspace_os_$(OS_TARGET)=1
 endif
 
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/sctp/src/Makefile.in
+++ b/netwerk/sctp/src/Makefile.in
@@ -126,9 +126,8 @@ endif
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 ifdef GNU_CC
 CFLAGS += -std=gnu99
 endif
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/socket/Makefile.in
+++ b/netwerk/socket/Makefile.in
@@ -11,9 +11,8 @@ FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@@ -102,9 +102,8 @@ endif
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 ifdef GNU_CC
 CFLAGS += -std=gnu99
 endif
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/streamconv/Makefile.in
+++ b/netwerk/streamconv/Makefile.in
@@ -6,9 +6,8 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@@ -15,9 +15,8 @@ LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 LOCAL_INCLUDES =                        \
         -I$(topsrcdir)/netwerk/base/src \
         $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/streamconv/public/Makefile.in
+++ b/netwerk/streamconv/public/Makefile.in
@@ -9,10 +9,8 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
-
--- a/netwerk/streamconv/src/Makefile.in
+++ b/netwerk/streamconv/src/Makefile.in
@@ -17,9 +17,8 @@ ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 ifeq (x86_64,$(OS_TEST))
 # nsAppleFileDecoder.cpp has warnings I don't understand.
 FAIL_ON_WARNINGS := 1
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/system/android/Makefile.in
+++ b/netwerk/system/android/Makefile.in
@@ -9,12 +9,10 @@ VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
-
 LOCAL_INCLUDES += -I$(srcdir)/../../base/src
  
--- a/netwerk/system/maemo/Makefile.in
+++ b/netwerk/system/maemo/Makefile.in
@@ -9,13 +9,11 @@ VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
-
 OS_INCLUDES += $(GLIB_CFLAGS) $(LIBCONIC_CFLAGS)
 LOCAL_INCLUDES += -I$(srcdir)/../../base/src
  
--- a/netwerk/system/qt/Makefile.in
+++ b/netwerk/system/qt/Makefile.in
@@ -10,12 +10,10 @@ VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
-
 OS_INCLUDES += $(MOZ_QT_CFLAGS)
 LOCAL_INCLUDES += -I$(srcdir)/../../base/src
--- a/netwerk/system/win32/Makefile.in
+++ b/netwerk/system/win32/Makefile.in
@@ -10,9 +10,8 @@ VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/netwerk/wifi/Makefile.in
+++ b/netwerk/wifi/Makefile.in
@@ -21,9 +21,8 @@ OS_INCLUDES += $(GLIB_CFLAGS)
 endif
 
 ifdef MOZ_ENABLE_DBUS
 OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DIMPL_NS_NET
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -486,18 +486,16 @@ ifneq (,$(or $(filter 1400,$(_MSC_VER)),
 ifdef MOZ_DEBUG
 EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
 endif
 endif
 endif
 
 EXTRA_DSO_LDOPTS += $(LIBS_DIR)
 
-DEFINES += -DIMPL_XREAPI
-
 EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 CXXFLAGS += $(TK_CFLAGS)
 OS_LIBS += \
   -framework SystemConfiguration \
   -framework QTKit \
   -framework IOKit \
@@ -662,22 +660,17 @@ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/config \
   -I$(topsrcdir)/widget/windows \
   $(NULL)
 
 OS_LIBS += $(LIBICONV)
 
 DEFINES += \
-  -D_IMPL_NS_COM \
-  -D_IMPL_NS_STRINGAPI \
-  -DEXPORT_XPT_API \
-  -DEXPORT_XPTC_API \
-  -D_IMPL_NS_GFX \
-  -D_IMPL_NS_WIDGET \
+  -DIMPL_LIBXUL \
   $(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 oleaut32)
 endif
 
 ifdef MOZ_DEBUG
 ifdef ENABLE_TESTS
--- a/toolkit/profile/Makefile.in
+++ b/toolkit/profile/Makefile.in
@@ -12,16 +12,14 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../xre \
   -I$(topsrcdir)/profile/dirserviceprovider/src \
   $(NULL)
 
-DEFINES += -DIMPL_XREAPI
-
 GARBAGE += nsProfileLock.cpp
 
 include $(topsrcdir)/config/rules.mk
 
 export:: $(topsrcdir)/profile/dirserviceprovider/src/nsProfileLock.cpp
 	$(INSTALL) $^ .
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -20,17 +20,17 @@ milestone_txt = $(topsrcdir)/config/mile
 LIBRARY_NAME = xulapp_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 ifeq ($(MOZ_GL_DEFAULT_PROVIDER),GLX)
 DEFINES += -DUSE_GLX_TEST
 endif
 
-DEFINES += -DIMPL_XREAPI \
+DEFINES += \
   -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"' \
   -DMOZ_APP_VERSION='"$(MOZ_APP_VERSION)"'
 
 ifdef MOZ_UPDATER
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DMOZ_UPDATER
 endif
 endif
--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@@ -29,17 +29,16 @@ NOT_THERE_YET_CPPSRCS = \
 	mozqwidget.cpp \
 	nsSound.cpp \
 	$(NULL)
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -D_IMPL_NS_WIDGET
 #DEFINES += -DDEBUG_WIDGETS
 
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/widget/xpwidgets \
 	-I$(topsrcdir)/widget/shared \
 	-I$(topsrcdir)/dom/system/android \
 	-I$(topsrcdir)/docshell/base \
 	-I$(topsrcdir)/content/events/src \
--- a/widget/gonk/Makefile.in
+++ b/widget/gonk/Makefile.in
@@ -25,17 +25,17 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME    = widget_gonk
 EXPORT_LIBRARY  = 1
 LIBXUL_LIBRARY  = 1
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -D_IMPL_NS_WIDGET -DHAVE_OFF64_T -DSK_BUILD_FOR_ANDROID_NDK
+DEFINES += -DHAVE_OFF64_T -DSK_BUILD_FOR_ANDROID_NDK
 
 LOCAL_INCLUDES += \
 	-I$(ANDROID_SOURCE)/hardware/libhardware/include \
 	-I$(ANDROID_SOURCE)/hardware/libhardware_legacy/include \
 	-I$(topsrcdir)/widget/xpwidgets \
 	-I$(topsrcdir)/widget/shared \
 	-I$(topsrcdir)/dom/system/android \
 	-I$(topsrcdir)/content/events/src \
--- a/widget/os2/Makefile.in
+++ b/widget/os2/Makefile.in
@@ -18,18 +18,16 @@ LIBXUL_LIBRARY = 1
 SHARED_LIBRARY_LIBS = \
 	../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
 
-DEFINES		+= -D_IMPL_NS_WIDGET
-
 DEFINES += -DUSE_OS2_TOOLKIT_HEADERS
 
 DEFINES += -DMOZ_APP_DISPLAYNAME=\"$(MOZ_APP_DISPLAYNAME)\"
 
 LOCAL_INCLUDES	= -I. -I$(srcdir)/../xpwidgets -I$(srcdir)
 
 install-readme:	README.$(MOZ_APP_NAME)
 ifneq (,$(filter-out xulrunner sunbird,$(MOZ_APP_NAME)))
--- a/widget/qt/Makefile.in
+++ b/widget/qt/Makefile.in
@@ -25,17 +25,16 @@ include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS	+= $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \
 		$(MOZ_PIXMAN_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
 CFLAGS		+= $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \
 		$(MOZ_PIXMAN_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
 
-DEFINES		+= -D_IMPL_NS_WIDGET
 #DEFINES		+= -DDEBUG_WIDGETS
 
 ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_BSD_SOURCE
 endif
 ifeq ($(OS_ARCH), SunOS) 
 ifndef GNU_CC
 # When using Sun's WorkShop compiler, including
--- a/widget/shared/Makefile.in
+++ b/widget/shared/Makefile.in
@@ -8,18 +8,13 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= widget_shared
 LIBXUL_LIBRARY  = 1
 
-
-DEFINES += \
-  -D_IMPL_NS_WIDGET \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS	+= $(TK_CFLAGS)
--- a/widget/windows/Makefile.in
+++ b/widget/windows/Makefile.in
@@ -11,17 +11,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= widget_windows
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY	= 1
 RESFILE		= widget.res
 LIBXUL_LIBRARY = 1
 
-DEFINES		+= -D_IMPL_NS_WIDGET -DMOZ_UNICODE 
+DEFINES		+= -DMOZ_UNICODE 
 
 ifdef MOZ_ENABLE_D3D9_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D9_LAYER
 endif
 
 ifdef MOZ_ENABLE_D3D10_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D10_LAYER
 endif
--- a/widget/windows/winrt/Makefile.in
+++ b/widget/windows/winrt/Makefile.in
@@ -8,17 +8,17 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME		= widget_winrt
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY	= 1
 
-DEFINES		+= -D_IMPL_NS_WIDGET -DMOZ_UNICODE
+DEFINES		+= -DMOZ_UNICODE
 
 ifdef MOZ_ENABLE_D3D9_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D9_LAYER
 endif
 
 ifdef MOZ_ENABLE_D3D10_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D10_LAYER
 endif
--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@@ -9,20 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= xpwidgets_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
 
-DEFINES += \
-  -D_IMPL_NS_WIDGET \
-  $(NULL)
-
 SHARED_LIBRARY_LIBS = ../shared/$(LIB_PREFIX)widget_shared.$(LIB_SUFFIX)
 ifdef MOZ_X11
 SHARED_LIBRARY_LIBS += ../shared/x11/$(LIB_PREFIX)widget_shared_x11.$(LIB_SUFFIX)
 endif
 
 ifdef MOZ_ENABLE_D3D10_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D10_LAYER
 endif
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -50,18 +50,16 @@ DISABLED_SDK_HEADERS += \
 		$(NULL)
 endif
 
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_COM
-
 ifdef MOZ_WIDGET_GTK
 CXXFLAGS        += $(TK_CFLAGS)
 endif
 
 LOCAL_INCLUDES += \
 		-I$(srcdir)/../build \
 		-I$(topsrcdir)/xpcom/ds \
 		$(NULL)
--- a/xpcom/base/nscore.h
+++ b/xpcom/base/nscore.h
@@ -230,17 +230,17 @@
 #else
 #define NS_EXTERN_C
 #endif
 
 #define EXPORT_XPCOM_API(type) NS_EXTERN_C NS_EXPORT type NS_FROZENCALL
 #define IMPORT_XPCOM_API(type) NS_EXTERN_C NS_IMPORT type NS_FROZENCALL
 #define GLUE_XPCOM_API(type) NS_EXTERN_C NS_HIDDEN_(type) NS_FROZENCALL
 
-#ifdef _IMPL_NS_COM
+#ifdef IMPL_LIBXUL
 #define XPCOM_API(type) EXPORT_XPCOM_API(type)
 #elif defined(XPCOM_GLUE)
 #define XPCOM_API(type) GLUE_XPCOM_API(type)
 #else
 #define XPCOM_API(type) IMPORT_XPCOM_API(type)
 #endif
 
 #ifdef MOZILLA_INTERNAL_API
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -70,20 +70,17 @@ DISABLED_SDK_HEADERS =  \
 
 GARBAGE         += $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= \
-		-D_IMPL_NS_COM \
 		-D_IMPL_NS_STRINGAPI \
-		-DEXPORT_XPT_API \
-		-DEXPORT_XPTC_API \
 		-DOMNIJAR_NAME="$(OMNIJAR_NAME)" \
 		$(NULL)
 
 ifdef TARGET_XPCOM_ABI
 DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\"
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
--- a/xpcom/build/xrecore.h
+++ b/xpcom/build/xrecore.h
@@ -9,15 +9,15 @@
 
 /**
  * Import/export macros for libXUL APIs.
  */
 #ifdef XPCOM_GLUE
 #define XRE_API(type, name, params) \
   typedef type (NS_FROZENCALL * name##Type) params; \
   extern name##Type name NS_HIDDEN;
-#elif defined(IMPL_XREAPI)
+#elif defined(IMPL_LIBXUL)
 #define XRE_API(type, name, params) EXPORT_XPCOM_API(type) name params;
 #else
 #define XRE_API(type, name, params) IMPORT_XPCOM_API(type) name params;
 #endif
 
 #endif // xrecore_h__
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@@ -21,13 +21,11 @@ LOCAL_INCLUDES	= \
 	-I$(srcdir)/../build \
 	-I.. \
 	-I$(topsrcdir)/chrome/src \
 	-I$(topsrcdir)/modules/libjar \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES	+= -D_IMPL_NS_COM
-
 ifdef MOZ_WIDGET_GTK
 CXXFLAGS        += $(TK_CFLAGS)
 endif
--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -19,9 +19,8 @@ EXTRA_COMPONENTS = \
   nsINIProcessor.manifest \
   $(NULL)
 
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += -I$(srcdir)/../io
 
-DEFINES		+= -D_IMPL_NS_COM
--- a/xpcom/ds/nsWindowsRegKey.h
+++ b/xpcom/ds/nsWindowsRegKey.h
@@ -21,23 +21,23 @@
  * This function may be used to instantiate a windows registry key object prior
  * to XPCOM being initialized.
  */
 extern "C" nsresult
 NS_NewWindowsRegKey(nsIWindowsRegKey **result);
 
 //-----------------------------------------------------------------------------
 
-#ifdef _IMPL_NS_COM
+#ifdef IMPL_LIBXUL
 
 // a53bc624-d577-4839-b8ec-bb5040a52ff4
 #define NS_WINDOWSREGKEY_CID \
   { 0xa53bc624, 0xd577, 0x4839, \
     { 0xb8, 0xec, 0xbb, 0x50, 0x40, 0xa5, 0x2f, 0xf4 } }
 
 extern nsresult
 nsWindowsRegKeyConstructor(nsISupports *outer, const nsIID &iid, void **result);
 
-#endif  // _IMPL_NS_COM
+#endif  // IMPL_LIBXUL
 
 //-----------------------------------------------------------------------------
 
 #endif  // nsWindowsRegKey_h__
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -26,18 +26,16 @@ DISABLED_SDK_HEADERS =  \
 		nsDirectoryServiceDefs.h \
 		nsDirectoryServiceUtils.h \
 		$(NULL)
 
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
-DEFINES		+= -D_IMPL_NS_COM
-
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(findstring lib64,$(libdir)))
 DEFINES     += -DHAVE_USR_LIB64_DIR
 endif
 endif
 
 LOCAL_INCLUDES	+= -I..
 
--- a/xpcom/reflect/xptcall/src/Makefile.in
+++ b/xpcom/reflect/xptcall/src/Makefile.in
@@ -14,11 +14,11 @@ MSVC_ENABLE_PGO := 1
 MOZILLA_INTERNAL_API = 1
 
 # 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
 
-DEFINES		+= -DEXPORT_XPTC_API -D_IMPL_NS_COM
+DEFINES		+= -DIMPL_LIBXUL
 
 LOCAL_INCLUDES += -I$(srcdir)/../../xptinfo/src
--- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
@@ -23,11 +23,11 @@ DEFINES		+= -DMOZ_NEED_LEADING_UNDERSCOR
 
 include $(topsrcdir)/config/config.mk
 
 # 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
 
-DEFINES		+= -DEXPORT_XPTC_API
+DEFINES		+= -DIMPL_LIBXUL
 
 LOCAL_INCLUDES	+= -I$(srcdir)/../..
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -272,17 +272,17 @@ CXXFLAGS	+= -fno-strict-aliasing -fno-in
 endif
 
 
 # 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
 
-DEFINES		+= -DEXPORT_XPTC_API -D_IMPL_NS_COM
+DEFINES		+= -DIMPL_LIBXUL
 
 LOCAL_INCLUDES += \
 	-I$(srcdir)/../.. \
 	-I$(srcdir)/../../../../xptinfo/src \
 	$(NULL)
 
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(findstring mips, $(OS_TEST)))
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -26,11 +26,11 @@ OS_COMPILE_CXXFLAGS += -GL-
 endif #!GNU_CXX
 endif #!x86_64
 
 # 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
 
-DEFINES		+= -DEXPORT_XPTC_API -D_IMPL_NS_COM
+DEFINES		+= -DIMPL_LIBXUL
 
 LOCAL_INCLUDES	+= -I$(srcdir)/../..
--- a/xpcom/reflect/xptinfo/src/Makefile.in
+++ b/xpcom/reflect/xptinfo/src/Makefile.in
@@ -17,9 +17,9 @@ MOZILLA_INTERNAL_API = 1
 FORCE_STATIC_LIB = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 # For nsManifestLineReader class.
 LOCAL_INCLUDES	= -I$(srcdir)/../../../ds
 
-DEFINES += -DEXPORT_XPT_API -D_IMPL_NS_COM
+DEFINES += -DIMPL_LIBXUL
--- a/xpcom/string/src/Makefile.in
+++ b/xpcom/string/src/Makefile.in
@@ -27,9 +27,9 @@ ifdef GNU_CC
 nsUTF8UtilsSSE2.$(OBJ_SUFFIX): CXXFLAGS+=-msse2
 endif
 
 ifdef SOLARIS_SUNPRO_CXX
 nsUTF8UtilsSSE2.$(OBJ_SUFFIX): CXXFLAGS+=-xarch=sse2 -xO4
 endif
 endif
 
-DEFINES		+= -D_IMPL_NS_COM
+DEFINES		+= -DIMPL_LIBXUL
--- a/xpcom/threads/Makefile.in
+++ b/xpcom/threads/Makefile.in
@@ -15,10 +15,8 @@ MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES	= -I$(srcdir)/../components
 LOCAL_INCLUDES = -I$(srcdir)/../build
 
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_COM
-
--- a/xpcom/typelib/xpt/src/Makefile.in
+++ b/xpcom/typelib/xpt/src/Makefile.in
@@ -20,17 +20,17 @@ FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 
 # Don't use profile-guided optimization
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -DEXPORT_XPT_API
+DEFINES		+= -DIMPL_LIBXUL
 
 # Build libxpt early so that it'll be available to xpidl, which also
 # must be built early.
 export::
 	@$(MAKE) -C ../../../base ErrorListCDefines.h
 	@$(MAKE) libs
 
 # XXX, bug 417045, make -jN combines badly with -save-temps in   
--- a/xpcom/typelib/xpt/tests/Makefile.in
+++ b/xpcom/typelib/xpt/tests/Makefile.in
@@ -15,9 +15,9 @@ DISABLED_SIMPLE_PROGRAMS = PrimitiveTest
 CSRCS		= PrimitiveTest.c SimpleTypeLib.c
 
 LIBS		= \
 		$(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DEXPORT_XPT_API
+DEFINES += -DIMPL_LIBXUL