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

This commit is contained in:
Benoit Girard 2013-07-12 08:56:54 -04:00
parent 54bfab9cb0
commit 5b43ee14ca
68 changed files with 23 additions and 117 deletions

View File

@ -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

View File

@ -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

View File

@ -31,4 +31,3 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
CXXFLAGS += $(MOZ_QT_CFLAGS)
endif
DEFINES += -D_IMPL_NS_GFX

View File

@ -53,7 +53,6 @@ DEFINES += -DMOZ_USING_ANDROID_JAVA_WIDGETS
endif
DEFINES += \
-DIMPL_THEBES \
-DHB_DONT_DEFINE_STDINT \
-DMOZ_OTS_REPORT_ERRORS \
-DGRAPHITE2_STATIC \

View File

@ -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

View File

@ -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

View File

@ -11,4 +11,3 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -11,4 +11,3 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -14,4 +14,4 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET
DEFINES += -DIMPL_LIBXUL

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

@ -20,4 +20,3 @@ LOCAL_INCLUDES = \
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -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

View File

@ -17,4 +17,3 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -25,4 +25,3 @@ LOCAL_INCLUDES := \
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -28,7 +28,7 @@ LOCAL_INCLUDES = \
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET \
DEFINES += \
-DHB_DONT_DEFINE_STDINT \
$(NULL)

View File

@ -17,5 +17,3 @@ LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -11,4 +11,3 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -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

View File

@ -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

View File

@ -21,5 +21,3 @@ LOCAL_INCLUDES = \
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -32,4 +32,3 @@ endif
endif
endif # WINNT
DEFINES += -DIMPL_NS_NET

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -131,4 +131,3 @@ ifdef GNU_CC
CFLAGS += -std=gnu99
endif
DEFINES += -DIMPL_NS_NET

View File

@ -16,4 +16,3 @@ LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -107,4 +107,3 @@ ifdef GNU_CC
CFLAGS += -std=gnu99
endif
DEFINES += -DIMPL_NS_NET

View File

@ -11,4 +11,3 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -20,4 +20,3 @@ LOCAL_INCLUDES = \
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -14,5 +14,3 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -22,4 +22,3 @@ endif
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -14,7 +14,5 @@ LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET
LOCAL_INCLUDES += -I$(srcdir)/../../base/src

View File

@ -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

View File

@ -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

View File

@ -15,4 +15,3 @@ LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -26,4 +26,3 @@ endif
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET

View File

@ -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)

View File

@ -17,8 +17,6 @@ LOCAL_INCLUDES = \
-I$(topsrcdir)/profile/dirserviceprovider/src \
$(NULL)
DEFINES += -DIMPL_XREAPI
GARBAGE += nsProfileLock.cpp
include $(topsrcdir)/config/rules.mk

View File

@ -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)"'

View File

@ -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 += \

View File

@ -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 \

View File

@ -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)\"

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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;

View File

@ -26,8 +26,6 @@ LOCAL_INCLUDES = \
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_COM
ifdef MOZ_WIDGET_GTK
CXXFLAGS += $(TK_CFLAGS)
endif

View File

@ -24,4 +24,3 @@ include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += -I$(srcdir)/../io
DEFINES += -D_IMPL_NS_COM

View File

@ -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
//-----------------------------------------------------------------------------

View File

@ -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

View File

@ -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

View File

@ -28,6 +28,6 @@ FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DEXPORT_XPTC_API
DEFINES += -DIMPL_LIBXUL
LOCAL_INCLUDES += -I$(srcdir)/../..

View File

@ -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)/../.. \

View File

@ -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)/../..

View File

@ -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

View File

@ -32,4 +32,4 @@ nsUTF8UtilsSSE2.$(OBJ_SUFFIX): CXXFLAGS+=-xarch=sse2 -xO4
endif
endif
DEFINES += -D_IMPL_NS_COM
DEFINES += -DIMPL_LIBXUL

View File

@ -20,5 +20,3 @@ LOCAL_INCLUDES = -I$(srcdir)/../build
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_COM

View File

@ -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.

View File

@ -20,4 +20,4 @@ LIBS = \
include $(topsrcdir)/config/rules.mk
DEFINES += -DEXPORT_XPT_API
DEFINES += -DIMPL_LIBXUL