Bug 892861 - Remove useless -D flags 'IMPL_THEBES,_IMPL_NS_GFX,...'. r=glandium

2024-09-13 09:24:08 -07:00 · 2013-07-12 08:56:54 -04:00 · 2013-07-12 08:56:54 -04:00 · 5b43ee14ca
commit 5b43ee14ca
parent 54bfab9cb0
68 changed files with 23 additions and 117 deletions
--- a/config/config.mk
+++ b/config/config.mk
@ -324,14 +324,7 @@ endif
 # 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
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@ -24,7 +24,6 @@ LIBRARY_NAME   = layers
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1

-DEFINES += -DIMPL_THEBES
 ifdef MOZ_DEBUG
 DEFINES += -DD3D_DEBUG_INFO
 endif
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@ -31,4 +31,3 @@ 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
@ -53,7 +53,6 @@ DEFINES +=	-DMOZ_USING_ANDROID_JAVA_WIDGETS
 endif

 DEFINES += \
-	-DIMPL_THEBES \
 	-DHB_DONT_DEFINE_STDINT \
 	-DMOZ_OTS_REPORT_ERRORS \
 	-DGRAPHITE2_STATIC \
--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@ -8,8 +8,6 @@ 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
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@ -324,14 +324,7 @@ endif
 # 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
--- a/netwerk/Makefile.in
+++ b/netwerk/Makefile.in
@ -11,4 +11,3 @@ include $(DEPTH)/config/autoconf.mk

 include $(topsrcdir)/config/rules.mk

-DEFINES += -DIMPL_NS_NET
--- a/netwerk/base/Makefile.in
+++ b/netwerk/base/Makefile.in
@ -11,4 +11,3 @@ 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
@ -14,4 +14,4 @@ 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
@ -6,7 +6,7 @@
 #define nsChannelProperties_h__

 #include "nsStringGlue.h"
-#ifdef IMPL_NS_NET
+#ifdef IMPL_LIBXUL
 #include "nsNetStrings.h"
 #endif

@ -25,7 +25,7 @@
 */
 #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 \
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@ -37,8 +37,6 @@ ifeq ($(OS_TARGET),Android)
 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
@ -126,4 +126,3 @@ 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
@ -20,4 +20,3 @@ LOCAL_INCLUDES = \

 include $(topsrcdir)/config/rules.mk

-DEFINES += -DIMPL_NS_NET
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@ -30,4 +30,3 @@ 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
@ -17,4 +17,3 @@ 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
@ -25,4 +25,3 @@ LOCAL_INCLUDES := \

 include $(topsrcdir)/config/rules.mk

-DEFINES += -DIMPL_NS_NET
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@ -28,7 +28,7 @@ LOCAL_INCLUDES = \

 include $(topsrcdir)/config/rules.mk

-DEFINES += -DIMPL_NS_NET \
+DEFINES += \
           -DHB_DONT_DEFINE_STDINT \
           $(NULL)

--- a/netwerk/mime/Makefile.in
+++ b/netwerk/mime/Makefile.in
@ -17,5 +17,3 @@ LIBXUL_LIBRARY = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES += -DIMPL_NS_NET
-
--- a/netwerk/protocol/Makefile.in
+++ b/netwerk/protocol/Makefile.in
@ -11,4 +11,3 @@ 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
@ -22,4 +22,3 @@ 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
@ -20,4 +20,3 @@ 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
@ -21,5 +21,3 @@ LOCAL_INCLUDES = \

 include $(topsrcdir)/config/rules.mk

-DEFINES += -DIMPL_NS_NET
-
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@ -32,4 +32,3 @@ endif
 endif
 endif # WINNT

-DEFINES += -DIMPL_NS_NET
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@ -26,5 +26,3 @@ 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
@ -23,5 +23,3 @@ 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
@ -25,4 +25,3 @@ 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
@ -21,5 +21,3 @@ 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
@ -43,4 +43,3 @@ 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
@ -131,4 +131,3 @@ ifdef GNU_CC
 CFLAGS += -std=gnu99
 endif

-DEFINES += -DIMPL_NS_NET
--- a/netwerk/socket/Makefile.in
+++ b/netwerk/socket/Makefile.in
@ -16,4 +16,3 @@ LIBXUL_LIBRARY = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES += -DIMPL_NS_NET
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@ -107,4 +107,3 @@ ifdef GNU_CC
 CFLAGS += -std=gnu99
 endif

-DEFINES += -DIMPL_NS_NET
--- a/netwerk/streamconv/Makefile.in
+++ b/netwerk/streamconv/Makefile.in
@ -11,4 +11,3 @@ 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
@ -20,4 +20,3 @@ LOCAL_INCLUDES =                        \

 include $(topsrcdir)/config/rules.mk

-DEFINES += -DIMPL_NS_NET
--- a/netwerk/streamconv/public/Makefile.in
+++ b/netwerk/streamconv/public/Makefile.in
@ -14,5 +14,3 @@ 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
@ -22,4 +22,3 @@ endif

 include $(topsrcdir)/config/rules.mk

-DEFINES += -DIMPL_NS_NET
--- a/netwerk/system/android/Makefile.in
+++ b/netwerk/system/android/Makefile.in
@ -14,7 +14,5 @@ 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
@ -14,8 +14,6 @@ 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
@ -15,7 +15,5 @@ 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
@ -15,4 +15,3 @@ LIBXUL_LIBRARY = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES += -DIMPL_NS_NET
--- a/netwerk/wifi/Makefile.in
+++ b/netwerk/wifi/Makefile.in
@ -26,4 +26,3 @@ endif

 include $(topsrcdir)/config/rules.mk

-DEFINES += -DIMPL_NS_NET
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@ -491,8 +491,6 @@ endif

 EXTRA_DSO_LDOPTS += $(LIBS_DIR)

-DEFINES += -DIMPL_XREAPI
-
 EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB)

 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
@ -667,12 +665,7 @@ LOCAL_INCLUDES += \
 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)
--- a/toolkit/profile/Makefile.in
+++ b/toolkit/profile/Makefile.in
@ -17,8 +17,6 @@ LOCAL_INCLUDES = \
  -I$(topsrcdir)/profile/dirserviceprovider/src \
  $(NULL)

-DEFINES += -DIMPL_XREAPI
-
 GARBAGE += nsProfileLock.cpp

 include $(topsrcdir)/config/rules.mk
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@ -25,7 +25,7 @@ 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)"'

--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@ -34,7 +34,6 @@ SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a

 include $(topsrcdir)/config/rules.mk

-DEFINES += -D_IMPL_NS_WIDGET
 #DEFINES += -DDEBUG_WIDGETS

 LOCAL_INCLUDES += \
--- a/widget/gonk/Makefile.in
+++ b/widget/gonk/Makefile.in
@ -30,7 +30,7 @@ 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 \
--- a/widget/os2/Makefile.in
+++ b/widget/os2/Makefile.in
@ -23,8 +23,6 @@ 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)\"
--- a/widget/qt/Makefile.in
+++ b/widget/qt/Makefile.in
@ -30,7 +30,6 @@ CXXFLAGS	+= $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_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)
--- a/widget/shared/Makefile.in
+++ b/widget/shared/Makefile.in
@ -13,11 +13,6 @@ 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
--- a/widget/windows/Makefile.in
+++ b/widget/windows/Makefile.in
@ -16,7 +16,7 @@ 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
--- a/widget/windows/winrt/Makefile.in
+++ b/widget/windows/winrt/Makefile.in
@ -13,7 +13,7 @@ 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
--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@ -14,10 +14,6 @@ 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)
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@ -55,8 +55,6 @@ 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
--- a/xpcom/base/nscore.h
+++ b/xpcom/base/nscore.h
@ -235,7 +235,7 @@
 #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)
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@ -75,10 +75,7 @@ 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)

--- a/xpcom/build/xrecore.h
+++ b/xpcom/build/xrecore.h
@ -14,7 +14,7 @@
 #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;
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@ -26,8 +26,6 @@ LOCAL_INCLUDES	= \

 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
@ -24,4 +24,3 @@ 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
@ -26,7 +26,7 @@ NS_NewWindowsRegKey(nsIWindowsRegKey **result);

 //-----------------------------------------------------------------------------

-#ifdef _IMPL_NS_COM
+#ifdef IMPL_LIBXUL

 // a53bc624-d577-4839-b8ec-bb5040a52ff4
 #define NS_WINDOWSREGKEY_CID \
@ -36,7 +36,7 @@ NS_NewWindowsRegKey(nsIWindowsRegKey **result);
 extern nsresult
 nsWindowsRegKeyConstructor(nsISupports *outer, const nsIID &iid, void **result);

-#endif  // _IMPL_NS_COM
+#endif  // IMPL_LIBXUL

 //-----------------------------------------------------------------------------

--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@ -31,8 +31,6 @@ DISABLED_SDK_HEADERS =  \
 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
--- a/xpcom/reflect/xptcall/src/Makefile.in
+++ b/xpcom/reflect/xptcall/src/Makefile.in
@ -19,6 +19,6 @@ 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
@ -28,6 +28,6 @@ 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
@ -277,7 +277,7 @@ 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/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@ -31,6 +31,6 @@ 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
@ -22,4 +22,4 @@ 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
@ -32,4 +32,4 @@ 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
@ -20,5 +20,3 @@ 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
@ -25,7 +25,7 @@ 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.
--- a/xpcom/typelib/xpt/tests/Makefile.in
+++ b/xpcom/typelib/xpt/tests/Makefile.in
@ -20,4 +20,4 @@ LIBS		= \

 include $(topsrcdir)/config/rules.mk

-DEFINES += -DEXPORT_XPT_API
+DEFINES += -DIMPL_LIBXUL