From 5b43ee14cadb37e9039c846fde3991e49cf2cba4 Mon Sep 17 00:00:00 2001 From: Benoit Girard Date: Fri, 12 Jul 2013 08:56:54 -0400 Subject: [PATCH] Bug 892861 - Remove useless -D flags 'IMPL_THEBES,_IMPL_NS_GFX,...'. r=glandium --- config/config.mk | 9 +-------- gfx/layers/Makefile.in | 1 - gfx/src/Makefile.in | 1 - gfx/thebes/Makefile.in | 1 - gfx/ycbcr/Makefile.in | 2 -- js/src/config/config.mk | 9 +-------- netwerk/Makefile.in | 1 - netwerk/base/Makefile.in | 1 - netwerk/base/public/Makefile.in | 2 +- netwerk/base/public/nsChannelProperties.h | 4 ++-- netwerk/base/src/Makefile.in | 2 -- netwerk/build/Makefile.in | 1 - netwerk/cache/Makefile.in | 1 - netwerk/cookie/Makefile.in | 1 - netwerk/dash/Makefile.in | 1 - netwerk/dash/mpd/Makefile.in | 1 - netwerk/dns/Makefile.in | 2 +- netwerk/mime/Makefile.in | 2 -- netwerk/protocol/Makefile.in | 1 - netwerk/protocol/about/Makefile.in | 1 - netwerk/protocol/device/Makefile.in | 1 - netwerk/protocol/file/Makefile.in | 2 -- netwerk/protocol/ftp/Makefile.in | 1 - netwerk/protocol/http/Makefile.in | 2 -- netwerk/protocol/res/Makefile.in | 2 -- netwerk/protocol/websocket/Makefile.in | 1 - netwerk/protocol/wyciwyg/Makefile.in | 2 -- netwerk/sctp/datachannel/Makefile.in | 1 - netwerk/sctp/src/Makefile.in | 1 - netwerk/socket/Makefile.in | 1 - netwerk/srtp/src/Makefile.in | 1 - netwerk/streamconv/Makefile.in | 1 - netwerk/streamconv/converters/Makefile.in | 1 - netwerk/streamconv/public/Makefile.in | 2 -- netwerk/streamconv/src/Makefile.in | 1 - netwerk/system/android/Makefile.in | 2 -- netwerk/system/maemo/Makefile.in | 2 -- netwerk/system/qt/Makefile.in | 2 -- netwerk/system/win32/Makefile.in | 1 - netwerk/wifi/Makefile.in | 1 - toolkit/library/Makefile.in | 9 +-------- toolkit/profile/Makefile.in | 2 -- toolkit/xre/Makefile.in | 2 +- widget/android/Makefile.in | 1 - widget/gonk/Makefile.in | 2 +- widget/os2/Makefile.in | 2 -- widget/qt/Makefile.in | 1 - widget/shared/Makefile.in | 5 ----- widget/windows/Makefile.in | 2 +- widget/windows/winrt/Makefile.in | 2 +- widget/xpwidgets/Makefile.in | 4 ---- xpcom/base/Makefile.in | 2 -- xpcom/base/nscore.h | 2 +- xpcom/build/Makefile.in | 3 --- xpcom/build/xrecore.h | 2 +- xpcom/components/Makefile.in | 2 -- xpcom/ds/Makefile.in | 1 - xpcom/ds/nsWindowsRegKey.h | 4 ++-- xpcom/io/Makefile.in | 2 -- xpcom/reflect/xptcall/src/Makefile.in | 2 +- xpcom/reflect/xptcall/src/md/os2/Makefile.in | 2 +- xpcom/reflect/xptcall/src/md/unix/Makefile.in | 2 +- xpcom/reflect/xptcall/src/md/win32/Makefile.in | 2 +- xpcom/reflect/xptinfo/src/Makefile.in | 2 +- xpcom/string/src/Makefile.in | 2 +- xpcom/threads/Makefile.in | 2 -- xpcom/typelib/xpt/src/Makefile.in | 2 +- xpcom/typelib/xpt/tests/Makefile.in | 2 +- 68 files changed, 23 insertions(+), 117 deletions(-) diff --git a/config/config.mk b/config/config.mk index 6c793f08d40..e2fa07f47ad 100644 --- 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 diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in index 4440ab86fc6..79c066d58fa 100644 --- 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 diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in index 152e55d1f58..b6881a508c3 100644 --- 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 diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in index 10899c0eb08..388969f79b6 100644 --- 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 \ diff --git a/gfx/ycbcr/Makefile.in b/gfx/ycbcr/Makefile.in index bd1487c62a6..c800ccf8b2d 100644 --- 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 diff --git a/js/src/config/config.mk b/js/src/config/config.mk index 6c793f08d40..e2fa07f47ad 100644 --- 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 diff --git a/netwerk/Makefile.in b/netwerk/Makefile.in index cb80f2af6a3..d2044d8ab77 100644 --- 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 diff --git a/netwerk/base/Makefile.in b/netwerk/base/Makefile.in index c09e7a7f399..0c112ea4ab9 100644 --- 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 diff --git a/netwerk/base/public/Makefile.in b/netwerk/base/public/Makefile.in index 08045875b61..45531d6beca 100644 --- 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 diff --git a/netwerk/base/public/nsChannelProperties.h b/netwerk/base/public/nsChannelProperties.h index cc4f8fcde52..0323a6f39d1 100644 --- 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 \ diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index 4b7121cd515..d6165fe6f0e 100644 --- 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 diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index 6b807da7580..010e8d22b5e 100644 --- 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 diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in index 6613fc65680..504f608b683 100644 --- 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 diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in index 61c590238e7..e9eb2725b11 100644 --- 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 diff --git a/netwerk/dash/Makefile.in b/netwerk/dash/Makefile.in index 2387584ea8a..d019128ad56 100644 --- 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 diff --git a/netwerk/dash/mpd/Makefile.in b/netwerk/dash/mpd/Makefile.in index e8196a5ac21..43999506e54 100644 --- 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 diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in index 1e1ed0b92b5..1f86632f70b 100644 --- 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) diff --git a/netwerk/mime/Makefile.in b/netwerk/mime/Makefile.in index 18d8d2059b7..8f31acf4d80 100644 --- 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 - diff --git a/netwerk/protocol/Makefile.in b/netwerk/protocol/Makefile.in index e22b50d84f0..f6bf6df58a2 100644 --- 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 diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in index 8473daa3413..f7df7944330 100644 --- 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 diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in index 58969b3d25f..3efc7365882 100644 --- 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 diff --git a/netwerk/protocol/file/Makefile.in b/netwerk/protocol/file/Makefile.in index ae1e76ac72f..1ff638f3323 100644 --- 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 - diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in index 082abf4393c..6b385e3ed5e 100644 --- a/netwerk/protocol/ftp/Makefile.in +++ b/netwerk/protocol/ftp/Makefile.in @@ -32,4 +32,3 @@ endif endif endif # WINNT -DEFINES += -DIMPL_NS_NET diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in index ca613e07aef..5982fa88ac2 100644 --- 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 - diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in index ff77c4fa0f1..284c4938e15 100644 --- 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 - diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in index d891d144a6f..909bef61796 100644 --- 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 diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in index 753a345072e..0cd0eec91cc 100644 --- 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 - diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in index e3677a297c1..72903c4f938 100644 --- 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 diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in index f88b0332d91..183db07174a 100644 --- 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 diff --git a/netwerk/socket/Makefile.in b/netwerk/socket/Makefile.in index f49b7ccf528..361ed47544b 100644 --- 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 diff --git a/netwerk/srtp/src/Makefile.in b/netwerk/srtp/src/Makefile.in index 42d5f1bef27..b534ee60576 100644 --- 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 diff --git a/netwerk/streamconv/Makefile.in b/netwerk/streamconv/Makefile.in index c09e7a7f399..0c112ea4ab9 100644 --- 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 diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in index 88f43eb0d30..486169e9d43 100644 --- 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 diff --git a/netwerk/streamconv/public/Makefile.in b/netwerk/streamconv/public/Makefile.in index fc8bb176bcb..711d3c09115 100644 --- 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 - diff --git a/netwerk/streamconv/src/Makefile.in b/netwerk/streamconv/src/Makefile.in index 18d77d5eede..fd890872574 100644 --- 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 diff --git a/netwerk/system/android/Makefile.in b/netwerk/system/android/Makefile.in index 6537c64d24b..38abf5c61d9 100644 --- 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 diff --git a/netwerk/system/maemo/Makefile.in b/netwerk/system/maemo/Makefile.in index f72f7ec5aad..18758f44715 100644 --- 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 diff --git a/netwerk/system/qt/Makefile.in b/netwerk/system/qt/Makefile.in index 44dcd56022a..9e69c12f489 100644 --- 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 diff --git a/netwerk/system/win32/Makefile.in b/netwerk/system/win32/Makefile.in index 0a793f9f27d..211db0b53f4 100644 --- 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 diff --git a/netwerk/wifi/Makefile.in b/netwerk/wifi/Makefile.in index f553daee29c..26dbd79fab2 100644 --- a/netwerk/wifi/Makefile.in +++ b/netwerk/wifi/Makefile.in @@ -26,4 +26,3 @@ endif include $(topsrcdir)/config/rules.mk -DEFINES += -DIMPL_NS_NET diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index c5b4f4f745e..a1709736c81 100644 --- 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) diff --git a/toolkit/profile/Makefile.in b/toolkit/profile/Makefile.in index 4d53045753f..181c931ac48 100644 --- 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 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 6319810dedf..17caef312ac 100644 --- 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)"' diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in index 71e3503aafd..2b708c178a2 100644 --- 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 += \ diff --git a/widget/gonk/Makefile.in b/widget/gonk/Makefile.in index 3a3903f087e..e5d93c4b63e 100644 --- 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 \ diff --git a/widget/os2/Makefile.in b/widget/os2/Makefile.in index c2d939a0b41..0de7b07f6bd 100644 --- 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)\" diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in index 7fbacb44da9..da58a9a1f9d 100644 --- 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) diff --git a/widget/shared/Makefile.in b/widget/shared/Makefile.in index 2644daaafb9..aaccf5c7aa5 100644 --- 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 diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in index 7d529e5df5c..e15388a0de7 100644 --- 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 diff --git a/widget/windows/winrt/Makefile.in b/widget/windows/winrt/Makefile.in index 8d1f39188f9..d2f7a8e2ecd 100644 --- 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 diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in index 008f2bd7e64..fd1785a9e4d 100644 --- 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) diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index c1c82f7981e..20f93139c6e 100644 --- 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 diff --git a/xpcom/base/nscore.h b/xpcom/base/nscore.h index 72f02e61d18..b52b6333067 100644 --- 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) diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 5deaf3ae3f7..0cd265c9026 100644 --- 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) diff --git a/xpcom/build/xrecore.h b/xpcom/build/xrecore.h index ae9324ca0d3..e0bdb597055 100644 --- 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; diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in index 27c7e473eb5..bc813c2fd63 100644 --- 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 diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in index e3a4cda8f72..637368ad17c 100644 --- 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 diff --git a/xpcom/ds/nsWindowsRegKey.h b/xpcom/ds/nsWindowsRegKey.h index def9c3b91a6..a3f4ced961e 100644 --- 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 //----------------------------------------------------------------------------- diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index 4ca98b7ad77..3b7ab12e472 100644 --- 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 diff --git a/xpcom/reflect/xptcall/src/Makefile.in b/xpcom/reflect/xptcall/src/Makefile.in index 80227391cb3..510cbdbb7e5 100644 --- 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 diff --git a/xpcom/reflect/xptcall/src/md/os2/Makefile.in b/xpcom/reflect/xptcall/src/md/os2/Makefile.in index 4af5766d07a..2c672b6c716 100644 --- 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)/../.. diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in index 6290bdc687d..a21c05819dd 100644 --- 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)/../.. \ diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in index 4e810766868..17274d1093d 100644 --- 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)/../.. diff --git a/xpcom/reflect/xptinfo/src/Makefile.in b/xpcom/reflect/xptinfo/src/Makefile.in index 736f1aec62b..671ceaeef97 100644 --- 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 diff --git a/xpcom/string/src/Makefile.in b/xpcom/string/src/Makefile.in index 701f1818429..2b6af773628 100644 --- 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 diff --git a/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in index de8b4dcab26..095ce6e0466 100644 --- 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 - diff --git a/xpcom/typelib/xpt/src/Makefile.in b/xpcom/typelib/xpt/src/Makefile.in index 3f446a5ea39..4316fec89dd 100644 --- 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. diff --git a/xpcom/typelib/xpt/tests/Makefile.in b/xpcom/typelib/xpt/tests/Makefile.in index a8206746cd5..d728e5b5784 100644 --- 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