diff --git a/mozilla/config/config.mak b/mozilla/config/config.mak index f74aec2f242..e570b389171 100644 --- a/mozilla/config/config.mak +++ b/mozilla/config/config.mak @@ -208,15 +208,10 @@ FINAL_LINK_LIBS=$(DIST)\final-link-libs CFLAGS=$(CFLAGS) -D_IMPL_NS_APPSHELL CFLAGS=$(CFLAGS) -D_IMPL_NS_COOKIE CFLAGS=$(CFLAGS) -D_IMPL_NS_GFX -CFLAGS=$(CFLAGS) -D_IMPL_NS_HTML -CFLAGS=$(CFLAGS) -D_IMPL_NS_HTMLPARS CFLAGS=$(CFLAGS) -D_IMPL_NS_LAYOUT CFLAGS=$(CFLAGS) -D_IMPL_NS_MSG_BASE CFLAGS=$(CFLAGS) -D_IMPL_NS_PICS CFLAGS=$(CFLAGS) -D_IMPL_NS_PLUGIN -CFLAGS=$(CFLAGS) -D_IMPL_NS_RDF -CFLAGS=$(CFLAGS) -D_IMPL_NS_VIEW -CFLAGS=$(CFLAGS) -D_IMPL_NS_WEB CFLAGS=$(CFLAGS) -D_IMPL_NS_WIDGET !endif diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index 5e65b6b73f9..51d3f601828 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -421,15 +421,10 @@ DEFINES += \ -D_IMPL_NS_APPSHELL \ -D_IMPL_NS_COOKIE \ -D_IMPL_NS_GFX \ - -D_IMPL_NS_HTML \ - -D_IMPL_NS_HTMLPARS \ -D_IMPL_NS_LAYOUT \ -D_IMPL_NS_MSG_BASE \ -D_IMPL_NS_PICS \ -D_IMPL_NS_PLUGIN \ - -D_IMPL_NS_RDF \ - -D_IMPL_NS_VIEW \ - -D_IMPL_NS_WEB \ -D_IMPL_NS_WIDGET \ $(NULL) endif diff --git a/mozilla/config/mac/DefinesMozilla.h b/mozilla/config/mac/DefinesMozilla.h index de692a5635b..a93b562cfad 100644 --- a/mozilla/config/mac/DefinesMozilla.h +++ b/mozilla/config/mac/DefinesMozilla.h @@ -52,8 +52,6 @@ // 98-09-25 mlm - turn on javascript thread safety #define JS_THREADSAFE 1 -#define USE_NSREG 1 - // External DTD support for XML #define XML_DTD diff --git a/mozilla/content/build/Makefile.in b/mozilla/content/build/Makefile.in index 7de39561c15..32b5a3daadb 100644 --- a/mozilla/content/build/Makefile.in +++ b/mozilla/content/build/Makefile.in @@ -121,8 +121,6 @@ LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=80 endif endif -DEFINES += -D_IMPL_NS_HTML - LOCAL_INCLUDES = -I$(srcdir)/../base/src \ -I$(srcdir)/../html/base/src \ -I$(srcdir)/../html/style/src \ diff --git a/mozilla/content/build/makefile.win b/mozilla/content/build/makefile.win index 471b33a8cea..6acb11c93ee 100644 --- a/mozilla/content/build/makefile.win +++ b/mozilla/content/build/makefile.win @@ -21,8 +21,6 @@ DEPTH=..\.. -DEFINES=-D_IMPL_NS_HTML - CPP_OBJS= \ .\$(OBJDIR)\nsContentDLF.obj \ .\$(OBJDIR)\nsContentModule.obj \ diff --git a/mozilla/content/events/src/Makefile.in b/mozilla/content/events/src/Makefile.in index 042a91e5694..f6a8586b2c9 100644 --- a/mozilla/content/events/src/Makefile.in +++ b/mozilla/content/events/src/Makefile.in @@ -60,8 +60,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/content/events/src/makefile.win b/mozilla/content/events/src/makefile.win index 18ce650b97f..10213c8f874 100644 --- a/mozilla/content/events/src/makefile.win +++ b/mozilla/content/events/src/makefile.win @@ -48,7 +48,7 @@ REQUIRES = xpcom \ include <$(DEPTH)\config\config.mak> -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= .\$(OBJDIR)\nsEventListenerManager.obj \ .\$(OBJDIR)\nsEventStateManager.obj \ diff --git a/mozilla/content/html/content/src/Makefile.in b/mozilla/content/html/content/src/Makefile.in index 78bd950799a..0fe7bf23de4 100644 --- a/mozilla/content/html/content/src/Makefile.in +++ b/mozilla/content/html/content/src/Makefile.in @@ -129,8 +129,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/content/html/content/src/makefile.win b/mozilla/content/html/content/src/makefile.win index ac93a77169e..b1a7c5e60b7 100644 --- a/mozilla/content/html/content/src/makefile.win +++ b/mozilla/content/html/content/src/makefile.win @@ -51,7 +51,7 @@ REQUIRES = xpcom \ layout_xul \ intl \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN !if defined(XP_NEW_SELECTION) DEFINES = $(DEFINES) -DXP_NEW_SELECTION !endif diff --git a/mozilla/content/html/document/src/Makefile.in b/mozilla/content/html/document/src/Makefile.in index 04583f09476..7dd94bce7d3 100644 --- a/mozilla/content/html/document/src/Makefile.in +++ b/mozilla/content/html/document/src/Makefile.in @@ -78,8 +78,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/content/html/document/src/makefile.win b/mozilla/content/html/document/src/makefile.win index 4671502c6b8..62626d9f184 100644 --- a/mozilla/content/html/document/src/makefile.win +++ b/mozilla/content/html/document/src/makefile.win @@ -53,7 +53,7 @@ REQUIRES = xpcom \ bookmarks \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN !if defined(XP_NEW_SELECTION) DEFINES = $(DEFINES) -DXP_NEW_SELECTION !endif diff --git a/mozilla/content/html/style/src/Makefile.in b/mozilla/content/html/style/src/Makefile.in index 745327dd49f..8a30e449fce 100644 --- a/mozilla/content/html/style/src/Makefile.in +++ b/mozilla/content/html/style/src/Makefile.in @@ -94,8 +94,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/content/html/style/src/makefile.win b/mozilla/content/html/style/src/makefile.win index cfba94f24f0..81e97abd803 100644 --- a/mozilla/content/html/style/src/makefile.win +++ b/mozilla/content/html/style/src/makefile.win @@ -43,7 +43,7 @@ REQUIRES = xpcom \ intl \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN EXPORTS = \ nsCSSValue.h \ diff --git a/mozilla/content/svg/content/src/Makefile.in b/mozilla/content/svg/content/src/Makefile.in index eca902781e5..517cde76cf1 100644 --- a/mozilla/content/svg/content/src/Makefile.in +++ b/mozilla/content/svg/content/src/Makefile.in @@ -90,8 +90,6 @@ CXXFLAGS += $(MOZ_LIBART_CFLAGS) include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - INCLUDES += \ -I$(srcdir)/../../../shared/public \ diff --git a/mozilla/content/svg/content/src/makefile.win b/mozilla/content/svg/content/src/makefile.win index e8ee876c312..745eb9885d3 100644 --- a/mozilla/content/svg/content/src/makefile.win +++ b/mozilla/content/svg/content/src/makefile.win @@ -44,7 +44,7 @@ REQUIRES = \ xpconnect \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ diff --git a/mozilla/content/svg/document/src/Makefile.in b/mozilla/content/svg/document/src/Makefile.in index 2aaa60d2e81..f52acd99114 100644 --- a/mozilla/content/svg/document/src/Makefile.in +++ b/mozilla/content/svg/document/src/Makefile.in @@ -53,8 +53,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - INCLUDES += \ -I$(srcdir) \ -I$(srcdir)/../../../xml/document/src \ diff --git a/mozilla/content/svg/document/src/makefile.win b/mozilla/content/svg/document/src/makefile.win index 636a11dbe82..3ece9470eea 100644 --- a/mozilla/content/svg/document/src/makefile.win +++ b/mozilla/content/svg/document/src/makefile.win @@ -27,7 +27,7 @@ DEPTH=..\..\..\.. LIBRARY_NAME=contentsvgdoc_s MODULE=raptor -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN REQUIRES = content \ layout \ widget \ diff --git a/mozilla/content/xbl/src/Makefile.in b/mozilla/content/xbl/src/Makefile.in index 1cb1c09401a..898acf7f533 100644 --- a/mozilla/content/xbl/src/Makefile.in +++ b/mozilla/content/xbl/src/Makefile.in @@ -94,8 +94,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/content/xbl/src/makefile.win b/mozilla/content/xbl/src/makefile.win index 9dd65cc4e7c..30ea78d1686 100644 --- a/mozilla/content/xbl/src/makefile.win +++ b/mozilla/content/xbl/src/makefile.win @@ -49,7 +49,7 @@ REQUIRES = xpcom \ locale \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsXBLBinding.obj \ diff --git a/mozilla/content/xml/content/src/Makefile.in b/mozilla/content/xml/content/src/Makefile.in index 40945f05062..24097b6d634 100644 --- a/mozilla/content/xml/content/src/Makefile.in +++ b/mozilla/content/xml/content/src/Makefile.in @@ -59,8 +59,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - INCLUDES += \ -I$(srcdir)/../../../base/src \ $(NULL) diff --git a/mozilla/content/xml/content/src/makefile.win b/mozilla/content/xml/content/src/makefile.win index f99833b8dea..5219ddbb7e4 100644 --- a/mozilla/content/xml/content/src/makefile.win +++ b/mozilla/content/xml/content/src/makefile.win @@ -40,7 +40,7 @@ REQUIRES = xpcom \ pref \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsXMLElement.obj \ diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in index c52d84b1d29..c2d2b6fe0f6 100644 --- a/mozilla/content/xml/document/src/Makefile.in +++ b/mozilla/content/xml/document/src/Makefile.in @@ -64,8 +64,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/content/xml/document/src/makefile.win b/mozilla/content/xml/document/src/makefile.win index e98c2591faf..1c181673282 100644 --- a/mozilla/content/xml/document/src/makefile.win +++ b/mozilla/content/xml/document/src/makefile.win @@ -48,7 +48,7 @@ REQUIRES = xpcom \ windowwatcher \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsXMLContentSink.obj \ diff --git a/mozilla/content/xsl/document/src/Makefile.in b/mozilla/content/xsl/document/src/Makefile.in index 205b99e96f1..ada81a0412f 100755 --- a/mozilla/content/xsl/document/src/Makefile.in +++ b/mozilla/content/xsl/document/src/Makefile.in @@ -38,8 +38,6 @@ REQUIRES = xpcom \ include $(topsrcdir)/config/config.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/content/xsl/document/src/makefile.win b/mozilla/content/xsl/document/src/makefile.win index 6638979308a..543dfb9688c 100644 --- a/mozilla/content/xsl/document/src/makefile.win +++ b/mozilla/content/xsl/document/src/makefile.win @@ -36,7 +36,7 @@ REQUIRES = xpcom \ content \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsXSLContentSink.obj \ diff --git a/mozilla/content/xul/content/src/Makefile.in b/mozilla/content/xul/content/src/Makefile.in index ba1e56f1f2c..d540e5b1648 100644 --- a/mozilla/content/xul/content/src/Makefile.in +++ b/mozilla/content/xul/content/src/Makefile.in @@ -62,8 +62,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/content/xul/content/src/makefile.win b/mozilla/content/xul/content/src/makefile.win index b8430a0c398..07a8c59ae38 100644 --- a/mozilla/content/xul/content/src/makefile.win +++ b/mozilla/content/xul/content/src/makefile.win @@ -43,7 +43,7 @@ REQUIRES = xpcom \ content \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsRDFDOMNodeList.obj \ diff --git a/mozilla/content/xul/document/src/Makefile.in b/mozilla/content/xul/document/src/Makefile.in index 568cfc8f817..7e959d59b06 100644 --- a/mozilla/content/xul/document/src/Makefile.in +++ b/mozilla/content/xul/document/src/Makefile.in @@ -71,8 +71,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/content/xul/document/src/makefile.win b/mozilla/content/xul/document/src/makefile.win index 42cfa331f27..ddd001015fb 100644 --- a/mozilla/content/xul/document/src/makefile.win +++ b/mozilla/content/xul/document/src/makefile.win @@ -50,7 +50,7 @@ REQUIRES = xpcom \ unicharutil \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN EXPORTS = \ $(NULL) diff --git a/mozilla/content/xul/templates/src/Makefile.in b/mozilla/content/xul/templates/src/Makefile.in index d2c6eb9f2c7..49008c77db9 100644 --- a/mozilla/content/xul/templates/src/Makefile.in +++ b/mozilla/content/xul/templates/src/Makefile.in @@ -78,8 +78,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/content/xul/templates/src/makefile.win b/mozilla/content/xul/templates/src/makefile.win index 7187e6addfd..2c577c2c324 100644 --- a/mozilla/content/xul/templates/src/makefile.win +++ b/mozilla/content/xul/templates/src/makefile.win @@ -42,7 +42,7 @@ REQUIRES = xpcom \ webshell \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsClusterKey.obj \ diff --git a/mozilla/docshell/macbuild/docshell.xml b/mozilla/docshell/macbuild/docshell.xml index 6bd0b71a37c..c4110a926ab 100644 --- a/mozilla/docshell/macbuild/docshell.xml +++ b/mozilla/docshell/macbuild/docshell.xml @@ -509,7 +509,7 @@ MWFrontEnd_C_onlystdkeywords0 MWFrontEnd_C_enumsalwaysint1 MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnamedocshellSharedPrefix.h + MWFrontEnd_C_prefixnameMacSharedPrefix.h MWFrontEnd_C_ansistrict0 MWFrontEnd_C_mpwcnewline0 MWFrontEnd_C_wchar_type1 @@ -1578,7 +1578,7 @@ MWFrontEnd_C_onlystdkeywords0 MWFrontEnd_C_enumsalwaysint1 MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnamedocshellSharedPrefix_debug.h + MWFrontEnd_C_prefixnameMacSharedPrefix_debug.h MWFrontEnd_C_ansistrict0 MWFrontEnd_C_mpwcnewline0 MWFrontEnd_C_wchar_type1 diff --git a/mozilla/editor/txmgr/tests/Makefile.in b/mozilla/editor/txmgr/tests/Makefile.in index 0bc011e4db5..7ab89c16d86 100644 --- a/mozilla/editor/txmgr/tests/Makefile.in +++ b/mozilla/editor/txmgr/tests/Makefile.in @@ -36,7 +36,5 @@ CPPSRCS = TestTXMgr.cpp LIBS = $(MOZ_COMPONENT_LIBS) -DEFINES += -DUSE_NSREG - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/editor/txmgr/tests/makefile.win b/mozilla/editor/txmgr/tests/makefile.win index 7cb38f05327..af96f96dedc 100644 --- a/mozilla/editor/txmgr/tests/makefile.win +++ b/mozilla/editor/txmgr/tests/makefile.win @@ -29,9 +29,6 @@ MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestTXMgr.exe PROGRAMS = $(PROG1) -LCFLAGS=-DUSE_NSREG - - LLIBS= \ $(DIST)\lib\xpcom.lib diff --git a/mozilla/extensions/cookie/tests/makefile.win b/mozilla/extensions/cookie/tests/makefile.win index 2d612ceb4b2..209db3070e8 100644 --- a/mozilla/extensions/cookie/tests/makefile.win +++ b/mozilla/extensions/cookie/tests/makefile.win @@ -32,8 +32,6 @@ REQUIRES = xpcom \ MAKE_OBJ_TYPE = EXE -LCFLAGS=-DUSE_NSREG - EXENAME=TestCookie PDBFILE=TestCookie.pdb MAPFILE=TestCookie.map diff --git a/mozilla/extensions/ctl/src/Makefile.in b/mozilla/extensions/ctl/src/Makefile.in index 288c9135129..f32b5e68e7d 100755 --- a/mozilla/extensions/ctl/src/Makefile.in +++ b/mozilla/extensions/ctl/src/Makefile.in @@ -48,8 +48,6 @@ CPPSRCS = \ include $(topsrcdir)/config/rules.mk -CFLAGS += -DUSE_NSREG - LOCAL_INCLUDES += -I$(srcdir)/pangoLite CXXFLAGS += $(GLIB_CFLAGS) diff --git a/mozilla/extensions/inspector/base/src/Makefile.in b/mozilla/extensions/inspector/base/src/Makefile.in index 6d387edf217..d508a66565c 100644 --- a/mozilla/extensions/inspector/base/src/Makefile.in +++ b/mozilla/extensions/inspector/base/src/Makefile.in @@ -73,8 +73,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/extensions/inspector/base/src/makefile.win b/mozilla/extensions/inspector/base/src/makefile.win index 77c149f050e..5c9a7c98166 100644 --- a/mozilla/extensions/inspector/base/src/makefile.win +++ b/mozilla/extensions/inspector/base/src/makefile.win @@ -45,7 +45,7 @@ REQUIRES = xpcom \ zlib \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN DIRS=win diff --git a/mozilla/extensions/inspector/base/src/win/Makefile.in b/mozilla/extensions/inspector/base/src/win/Makefile.in index 724c5e266f1..4256bd4f0d6 100644 --- a/mozilla/extensions/inspector/base/src/win/Makefile.in +++ b/mozilla/extensions/inspector/base/src/win/Makefile.in @@ -48,8 +48,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/extensions/inspector/base/src/win/makefile.win b/mozilla/extensions/inspector/base/src/win/makefile.win index 8ba20564653..bbf742093cb 100755 --- a/mozilla/extensions/inspector/base/src/win/makefile.win +++ b/mozilla/extensions/inspector/base/src/win/makefile.win @@ -34,7 +34,7 @@ REQUIRES = xpcom \ necko \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN INCS = $(INCS) \ -I$(DEPTH)\dist\include \ diff --git a/mozilla/extensions/pics/tests/makefile.win b/mozilla/extensions/pics/tests/makefile.win index 5e06f1c14cf..9a51997eb55 100644 --- a/mozilla/extensions/pics/tests/makefile.win +++ b/mozilla/extensions/pics/tests/makefile.win @@ -27,7 +27,7 @@ MODULE=pics MAKE_OBJ_TYPE = EXE -LCFLAGS=-DUSE_NSREG -DNECKO +LCFLAGS=-DNECKO EXENAME=TestPICS PDBFILE=TestPICS.pdb diff --git a/mozilla/extensions/universalchardet/tests/Makefile.in b/mozilla/extensions/universalchardet/tests/Makefile.in index 0afd826644f..c1d262bab80 100644 --- a/mozilla/extensions/universalchardet/tests/Makefile.in +++ b/mozilla/extensions/universalchardet/tests/Makefile.in @@ -37,8 +37,6 @@ CPPSRCS = \ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) -DEFINES += -DUSE_NSREG - include $(topsrcdir)/config/config.mk LIBS += \ diff --git a/mozilla/extensions/universalchardet/tests/makefile.win b/mozilla/extensions/universalchardet/tests/makefile.win index 50f5f90ffb4..a3c5b9a8219 100644 --- a/mozilla/extensions/universalchardet/tests/makefile.win +++ b/mozilla/extensions/universalchardet/tests/makefile.win @@ -29,8 +29,6 @@ PROGRAMNAME = UniversalChardetTest.exe PROG1 = .\$(OBJDIR)\$(PROGRAMNAME) PROGRAM = $(PROG1) -LCFLAGS=-DUSE_NSREG - LLIBS= \ $(DIST)\lib\xpcom.lib \ $(LIBNSPR) diff --git a/mozilla/extensions/webservices/schema/src/Makefile.in b/mozilla/extensions/webservices/schema/src/Makefile.in index a01532bd836..9ffcbd7c6e8 100644 --- a/mozilla/extensions/webservices/schema/src/Makefile.in +++ b/mozilla/extensions/webservices/schema/src/Makefile.in @@ -57,8 +57,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/extensions/webservices/soap/src/Makefile.in b/mozilla/extensions/webservices/soap/src/Makefile.in index cb4cc4edd93..3f5e81c0786 100644 --- a/mozilla/extensions/webservices/soap/src/Makefile.in +++ b/mozilla/extensions/webservices/soap/src/Makefile.in @@ -75,8 +75,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/extensions/webservices/wsdl/src/Makefile.in b/mozilla/extensions/webservices/wsdl/src/Makefile.in index 3c5d4fcee70..f94454492d0 100644 --- a/mozilla/extensions/webservices/wsdl/src/Makefile.in +++ b/mozilla/extensions/webservices/wsdl/src/Makefile.in @@ -55,8 +55,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/extensions/xmlextras/base/src/Makefile.in b/mozilla/extensions/xmlextras/base/src/Makefile.in index 78cdb5a060a..1908ce552b4 100644 --- a/mozilla/extensions/xmlextras/base/src/Makefile.in +++ b/mozilla/extensions/xmlextras/base/src/Makefile.in @@ -59,8 +59,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/extensions/xmlextras/base/src/makefile.win b/mozilla/extensions/xmlextras/base/src/makefile.win index 26b6efc0770..43c3dcb9f1b 100644 --- a/mozilla/extensions/xmlextras/base/src/makefile.win +++ b/mozilla/extensions/xmlextras/base/src/makefile.win @@ -41,7 +41,7 @@ REQUIRES = xpcom \ windowwatcher \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsDOMSerializer.obj \ diff --git a/mozilla/extensions/xmlextras/proxy/src/makefile.win b/mozilla/extensions/xmlextras/proxy/src/makefile.win index 84e459e045c..6b80b478597 100755 --- a/mozilla/extensions/xmlextras/proxy/src/makefile.win +++ b/mozilla/extensions/xmlextras/proxy/src/makefile.win @@ -28,7 +28,7 @@ DIRS=tests LIBRARY_NAME=xmlextrasproxy_s MODULE=xmlextras -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN REQUIRES = xpcom \ string \ diff --git a/mozilla/extensions/xmlextras/proxy/src/tests/makefile.win b/mozilla/extensions/xmlextras/proxy/src/tests/makefile.win index e8c05e29c66..6a4c78222de 100644 --- a/mozilla/extensions/xmlextras/proxy/src/tests/makefile.win +++ b/mozilla/extensions/xmlextras/proxy/src/tests/makefile.win @@ -25,7 +25,7 @@ MODULE=wsproxytest LIBRARY_NAME=wsproxytest MODULE_NAME=WSPProxyTestModule -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN XPIDLSRCS = .\nsIWSPProxyTest.idl \ $(NULL) diff --git a/mozilla/extensions/xmlextras/schema/src/Makefile.in b/mozilla/extensions/xmlextras/schema/src/Makefile.in index a01532bd836..9ffcbd7c6e8 100644 --- a/mozilla/extensions/xmlextras/schema/src/Makefile.in +++ b/mozilla/extensions/xmlextras/schema/src/Makefile.in @@ -57,8 +57,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/extensions/xmlextras/schema/src/makefile.win b/mozilla/extensions/xmlextras/schema/src/makefile.win index 65c805f67b7..a7cb7fdfe7a 100644 --- a/mozilla/extensions/xmlextras/schema/src/makefile.win +++ b/mozilla/extensions/xmlextras/schema/src/makefile.win @@ -48,7 +48,7 @@ REQUIRES = xpcom \ necko \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsSchema.obj \ diff --git a/mozilla/extensions/xmlextras/soap/src/Makefile.in b/mozilla/extensions/xmlextras/soap/src/Makefile.in index cb4cc4edd93..3f5e81c0786 100644 --- a/mozilla/extensions/xmlextras/soap/src/Makefile.in +++ b/mozilla/extensions/xmlextras/soap/src/Makefile.in @@ -75,8 +75,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/extensions/xmlextras/soap/src/makefile.win b/mozilla/extensions/xmlextras/soap/src/makefile.win index 119ee3da2dd..b3a78447513 100644 --- a/mozilla/extensions/xmlextras/soap/src/makefile.win +++ b/mozilla/extensions/xmlextras/soap/src/makefile.win @@ -51,7 +51,7 @@ REQUIRES = \ xpconnect \ necko -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN OBJS= \ .\$(OBJDIR)\nsDefaultSOAPEncoder.obj \ diff --git a/mozilla/extensions/xmlextras/tests/Makefile.in b/mozilla/extensions/xmlextras/tests/Makefile.in index 110a1a3b983..a94cbb9dc0d 100644 --- a/mozilla/extensions/xmlextras/tests/Makefile.in +++ b/mozilla/extensions/xmlextras/tests/Makefile.in @@ -52,8 +52,6 @@ LIBS = \ include $(topsrcdir)/config/rules.mk -DEFINES += -DUSE_NSREG - ifeq ($(OS_ARCH),WINNT) CXXFLAGS += -GX endif diff --git a/mozilla/extensions/xmlextras/tests/makefile.win b/mozilla/extensions/xmlextras/tests/makefile.win index 85848f0462a..743b6fa0de7 100755 --- a/mozilla/extensions/xmlextras/tests/makefile.win +++ b/mozilla/extensions/xmlextras/tests/makefile.win @@ -40,7 +40,7 @@ PROG1 = .\$(OBJDIR)\TestXMLExtras.exe PROGRAMS = $(PROG1) \ $(NULL) -LCFLAGS = -DUSE_NSREG -GX +LCFLAGS = -GX LLIBS = \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/extensions/xmlextras/wsdl/src/Makefile.in b/mozilla/extensions/xmlextras/wsdl/src/Makefile.in index 3c5d4fcee70..f94454492d0 100644 --- a/mozilla/extensions/xmlextras/wsdl/src/Makefile.in +++ b/mozilla/extensions/xmlextras/wsdl/src/Makefile.in @@ -55,8 +55,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/extensions/xmlextras/wsdl/src/makefile.win b/mozilla/extensions/xmlextras/wsdl/src/makefile.win index dafcabba771..c76204ccb14 100644 --- a/mozilla/extensions/xmlextras/wsdl/src/makefile.win +++ b/mozilla/extensions/xmlextras/wsdl/src/makefile.win @@ -24,7 +24,7 @@ DEPTH=..\..\..\.. LIBRARY_NAME=xmlextraswsdl_s MODULE=xmlextras -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN REQUIRES = xpcom \ string \ diff --git a/mozilla/htmlparser/macbuild/htmlparser.xml b/mozilla/htmlparser/macbuild/htmlparser.xml index c90f017aa82..109dfe92557 100644 --- a/mozilla/htmlparser/macbuild/htmlparser.xml +++ b/mozilla/htmlparser/macbuild/htmlparser.xml @@ -479,7 +479,7 @@ MWFrontEnd_C_onlystdkeywords0 MWFrontEnd_C_enumsalwaysint1 MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnamehtmlparserSharedPrefix_debug.h + MWFrontEnd_C_prefixnameMacSharedPrefix_debug.h MWFrontEnd_C_ansistrict0 MWFrontEnd_C_mpwcnewline0 MWFrontEnd_C_wchar_type1 @@ -1722,7 +1722,7 @@ MWFrontEnd_C_onlystdkeywords0 MWFrontEnd_C_enumsalwaysint1 MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnamehtmlparserSharedPrefix.h + MWFrontEnd_C_prefixnameMacSharedPrefix.h MWFrontEnd_C_ansistrict0 MWFrontEnd_C_mpwcnewline0 MWFrontEnd_C_wchar_type1 diff --git a/mozilla/htmlparser/robot/test/Makefile.in b/mozilla/htmlparser/robot/test/Makefile.in index b5c83682c4c..df102c08b4b 100644 --- a/mozilla/htmlparser/robot/test/Makefile.in +++ b/mozilla/htmlparser/robot/test/Makefile.in @@ -50,8 +50,6 @@ include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk -DEFINES += -DUSE_NSREG - ifdef ($(OS_ARCH),WINNT) ifdef GNU_CC LDFLAGS += -SUBSYSTEM:CONSOLE diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in index fc7750201f6..b206084428e 100644 --- a/mozilla/htmlparser/src/Makefile.in +++ b/mozilla/htmlparser/src/Makefile.in @@ -92,7 +92,7 @@ EXTRA_DSO_LDOPTS += \ include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTMLPARS -DXML_DTD +DEFINES += -DXML_DTD ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win index 034a1ea4ef0..188002c265e 100644 --- a/mozilla/htmlparser/src/makefile.win +++ b/mozilla/htmlparser/src/makefile.win @@ -38,7 +38,7 @@ REQUIRES = xpcom \ include <$(DEPTH)\config\config.mak> LIBRARY_NAME=raptorhtmlpars -DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN -DXML_DTD +DEFINES=-DWIN32_LEAN_AND_MEAN -DXML_DTD LIBRARY_NAME = gkparser MODULE_NAME = nsParserModule diff --git a/mozilla/intl/chardet/tests/Makefile.in b/mozilla/intl/chardet/tests/Makefile.in index a79f58107e3..400fefea7cb 100644 --- a/mozilla/intl/chardet/tests/Makefile.in +++ b/mozilla/intl/chardet/tests/Makefile.in @@ -38,7 +38,6 @@ LIBS = $(XPCOM_LIBS) $(NSPR_LIBS) include $(topsrcdir)/config/rules.mk -DEFINES += -DUSE_NSREG INCLUDES += -I$(srcdir)/../public diff --git a/mozilla/intl/chardet/tests/makefile.win b/mozilla/intl/chardet/tests/makefile.win index 95c7cd47ae6..00c7fca3407 100644 --- a/mozilla/intl/chardet/tests/makefile.win +++ b/mozilla/intl/chardet/tests/makefile.win @@ -28,7 +28,6 @@ REQUIRES = xpcom \ MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\DetectCharset.exe PROGRAMS = $(PROG1) -LCFLAGS=-DUSE_NSREG LLIBS= \ diff --git a/mozilla/intl/chardet/tools/makefile.win b/mozilla/intl/chardet/tools/makefile.win index 90285576e45..9721ebd582d 100644 --- a/mozilla/intl/chardet/tools/makefile.win +++ b/mozilla/intl/chardet/tools/makefile.win @@ -27,7 +27,6 @@ MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\GenCyrillicClass.exe PROGRAMS = $(PROG1) -LCFLAGS=-DUSE_NSREG REQUIRES=\ xpcom \ string \ diff --git a/mozilla/intl/compatibility/tests/makefile.win b/mozilla/intl/compatibility/tests/makefile.win index 99899cca1bb..f733a9fc8f6 100644 --- a/mozilla/intl/compatibility/tests/makefile.win +++ b/mozilla/intl/compatibility/tests/makefile.win @@ -27,8 +27,6 @@ MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestI18nCompatibility.exe PROGRAMS = $(PROG1) -LCFLAGS=-DUSE_NSREG - LLIBS= \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/intl/locale/tests/makefile.win b/mozilla/intl/locale/tests/makefile.win index 10204507b9f..68e94f615f4 100644 --- a/mozilla/intl/locale/tests/makefile.win +++ b/mozilla/intl/locale/tests/makefile.win @@ -31,7 +31,6 @@ PROGRAMS = $(PROG1) $(PROG2) SRPTS = $(SRPT1) -LCFLAGS=-DUSE_NSREG $(LCFLAGS) LLIBS= \ diff --git a/mozilla/intl/lwbrk/src/Makefile.in b/mozilla/intl/lwbrk/src/Makefile.in index 1f60e0b58d5..7c3d28f8a9a 100644 --- a/mozilla/intl/lwbrk/src/Makefile.in +++ b/mozilla/intl/lwbrk/src/Makefile.in @@ -48,8 +48,6 @@ CPPSRCS = \ include $(topsrcdir)/config/rules.mk -CFLAGS += -DUSE_NSREG - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) # Reserved name __STDC__ cannot be defined as a macro name on AIX or OpenVMS. diff --git a/mozilla/intl/lwbrk/tests/Makefile.in b/mozilla/intl/lwbrk/tests/Makefile.in index 3b11df5acb5..ef65a4794fc 100644 --- a/mozilla/intl/lwbrk/tests/Makefile.in +++ b/mozilla/intl/lwbrk/tests/Makefile.in @@ -37,6 +37,5 @@ LIBS = $(XPCOM_LIBS) $(NSPR_LIBS) include $(topsrcdir)/config/rules.mk -DEFINES += -DUSE_NSREG LOCAL_INCLUDES = -I$(srcdir)/../public diff --git a/mozilla/intl/lwbrk/tests/makefile.win b/mozilla/intl/lwbrk/tests/makefile.win index 53a93d65367..bff8edcba8c 100644 --- a/mozilla/intl/lwbrk/tests/makefile.win +++ b/mozilla/intl/lwbrk/tests/makefile.win @@ -31,8 +31,6 @@ MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestLineBreak.exe PROGRAMS = $(PROG1) -LCFLAGS=-DUSE_NSREG - LLIBS= \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/intl/uconv/src/Makefile.in b/mozilla/intl/uconv/src/Makefile.in index 4ec67183957..5bbf49d4e7b 100644 --- a/mozilla/intl/uconv/src/Makefile.in +++ b/mozilla/intl/uconv/src/Makefile.in @@ -118,8 +118,6 @@ endif include $(topsrcdir)/config/rules.mk -CFLAGS += -DUSE_NSREG - # Reserved name __STDC__ cannot be defined as a macro name on AIX or OpenVMS. # QNX simply objects to the way it's being redefined. ifeq (,$(filter AIX OpenVMS QNX HP-UX,$(OS_ARCH))) diff --git a/mozilla/intl/uconv/tests/Makefile.in b/mozilla/intl/uconv/tests/Makefile.in index 52b0e69529f..d3c8cd98b8b 100644 --- a/mozilla/intl/uconv/tests/Makefile.in +++ b/mozilla/intl/uconv/tests/Makefile.in @@ -47,8 +47,6 @@ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) include $(topsrcdir)/config/rules.mk -DEFINES += -DUSE_NSREG - INCLUDES += \ -I$(srcdir)/../ucvlatin \ -I$(srcdir)/../ucvja \ diff --git a/mozilla/intl/uconv/tests/makefile.win b/mozilla/intl/uconv/tests/makefile.win index 71bf3fcd132..0c1ec7b7e21 100644 --- a/mozilla/intl/uconv/tests/makefile.win +++ b/mozilla/intl/uconv/tests/makefile.win @@ -34,7 +34,6 @@ PROG4 = .\$(OBJDIR)\plattest.exe PROG5 = .\$(OBJDIR)\TestUConv.exe PROGRAMS = $(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5) -LCFLAGS = -DUSE_NSREG LLIBS = \ diff --git a/mozilla/intl/unicharutil/tests/Makefile.in b/mozilla/intl/unicharutil/tests/Makefile.in index 1d452fc298c..c78c16a5b11 100644 --- a/mozilla/intl/unicharutil/tests/Makefile.in +++ b/mozilla/intl/unicharutil/tests/Makefile.in @@ -45,6 +45,3 @@ include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/../public -ifeq ($(OS_ARCH),WINNT) -DEFINES += -DUSE_NSREG -endif diff --git a/mozilla/intl/unicharutil/tests/makefile.win b/mozilla/intl/unicharutil/tests/makefile.win index edeb5142a02..e55e86b576c 100644 --- a/mozilla/intl/unicharutil/tests/makefile.win +++ b/mozilla/intl/unicharutil/tests/makefile.win @@ -32,8 +32,6 @@ MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\UnicharSelfTest.exe PROGRAMS = $(PROG1) -LCFLAGS=-DUSE_NSREG - LLIBS= \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/js/src/xpconnect/shell/Makefile.in b/mozilla/js/src/xpconnect/shell/Makefile.in index f3841700b2f..b2db45c7db1 100644 --- a/mozilla/js/src/xpconnect/shell/Makefile.in +++ b/mozilla/js/src/xpconnect/shell/Makefile.in @@ -56,7 +56,7 @@ LIBS = \ include $(topsrcdir)/config/rules.mk -DEFINES += -DJS_THREADSAFE -DUSE_NSREG +DEFINES += -DJS_THREADSAFE ifeq ($(OS_ARCH), Linux) DEFINES += -D_BSD_SOURCE endif diff --git a/mozilla/js/src/xpconnect/shell/makefile.win b/mozilla/js/src/xpconnect/shell/makefile.win index 66faf664e08..2cee459d63f 100644 --- a/mozilla/js/src/xpconnect/shell/makefile.win +++ b/mozilla/js/src/xpconnect/shell/makefile.win @@ -43,7 +43,7 @@ MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\xpcshell.exe PROGRAMS = $(PROG1) -LCFLAGS=-DUSE_NSREG -DWIN32_LEAN_AND_MEAN +LCFLAGS=-DWIN32_LEAN_AND_MEAN LLIBS= \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/js/src/xpconnect/tests/Makefile.in b/mozilla/js/src/xpconnect/tests/Makefile.in index 8493bde4093..778b479ee30 100644 --- a/mozilla/js/src/xpconnect/tests/Makefile.in +++ b/mozilla/js/src/xpconnect/tests/Makefile.in @@ -59,7 +59,7 @@ LIBS = \ include $(topsrcdir)/config/rules.mk -DEFINES += -DJS_THREADSAFE -DUSE_NSREG -DJSFILE +DEFINES += -DJS_THREADSAFE -DJSFILE ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/js/src/xpconnect/tests/makefile.win b/mozilla/js/src/xpconnect/tests/makefile.win index 2d87a018e0d..4d8bd2456e6 100644 --- a/mozilla/js/src/xpconnect/tests/makefile.win +++ b/mozilla/js/src/xpconnect/tests/makefile.win @@ -46,7 +46,7 @@ MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestXPC.exe PROGRAMS = $(PROG1) -LCFLAGS=-DUSE_NSREG -DWIN32_LEAN_AND_MEAN -DJS_THREADSAFE -DJSFILE +LCFLAGS=-DWIN32_LEAN_AND_MEAN -DJS_THREADSAFE -DJSFILE LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\js -I$(PUBLIC)\xpconnect \ diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index 955f3c16cbb..546de7228ff 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -102,8 +102,6 @@ endif include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - INCLUDES += -I$(srcdir)/../base/src \ -I$(srcdir)/../html/base/src \ -I$(srcdir)/../html/style/src \ diff --git a/mozilla/layout/build/makefile.win b/mozilla/layout/build/makefile.win index ea7ca4da225..b4b0954c90d 100644 --- a/mozilla/layout/build/makefile.win +++ b/mozilla/layout/build/makefile.win @@ -33,8 +33,6 @@ REQUIRES = xpcom \ include <$(DEPTH)/config/config.mak> -DEFINES=-D_IMPL_NS_HTML - LIBRARY_NAME=gklayout MODULE_NAME=nsLayoutModule diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in index b9057266a98..b448ca27bbf 100644 --- a/mozilla/layout/html/base/src/Makefile.in +++ b/mozilla/layout/html/base/src/Makefile.in @@ -147,8 +147,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/layout/html/base/src/makefile.win b/mozilla/layout/html/base/src/makefile.win index 67d7e30f2bf..5d2ab4f4871 100644 --- a/mozilla/layout/html/base/src/makefile.win +++ b/mozilla/layout/html/base/src/makefile.win @@ -54,7 +54,7 @@ REQUIRES = xpcom \ include <$(DEPTH)\config\config.mak> LIBRARY_NAME=layouthtmlbase_s -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN !if defined(XP_NEW_SELECTION) DEFINES = $(DEFINES) -DXP_NEW_SELECTION !endif diff --git a/mozilla/layout/html/document/src/Makefile.in b/mozilla/layout/html/document/src/Makefile.in index b699151f57d..3d64a578499 100644 --- a/mozilla/layout/html/document/src/Makefile.in +++ b/mozilla/layout/html/document/src/Makefile.in @@ -60,8 +60,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/layout/html/document/src/makefile.win b/mozilla/layout/html/document/src/makefile.win index c037bce81b2..81a0f125af0 100644 --- a/mozilla/layout/html/document/src/makefile.win +++ b/mozilla/layout/html/document/src/makefile.win @@ -45,7 +45,7 @@ REQUIRES = xpcom \ webBrowser_core \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN !if defined(XP_NEW_SELECTION) DEFINES = $(DEFINES) -DXP_NEW_SELECTION !endif diff --git a/mozilla/layout/html/forms/src/Makefile.in b/mozilla/layout/html/forms/src/Makefile.in index f6f4d9e31f5..ccb15339a06 100644 --- a/mozilla/layout/html/forms/src/Makefile.in +++ b/mozilla/layout/html/forms/src/Makefile.in @@ -76,8 +76,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/layout/html/forms/src/makefile.win b/mozilla/layout/html/forms/src/makefile.win index d2701543993..a7fd9e8630d 100644 --- a/mozilla/layout/html/forms/src/makefile.win +++ b/mozilla/layout/html/forms/src/makefile.win @@ -23,7 +23,7 @@ DEPTH=..\..\..\.. LIBRARY_NAME=layouthtmlforms_s -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN MODULE=layout REQUIRES = xpcom \ string \ diff --git a/mozilla/layout/html/style/src/Makefile.in b/mozilla/layout/html/style/src/Makefile.in index dd075e79fc2..a8c5fd1d46d 100644 --- a/mozilla/layout/html/style/src/Makefile.in +++ b/mozilla/layout/html/style/src/Makefile.in @@ -63,8 +63,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/layout/html/style/src/makefile.win b/mozilla/layout/html/style/src/makefile.win index d15ee9c067e..f3865dd79f3 100644 --- a/mozilla/layout/html/style/src/makefile.win +++ b/mozilla/layout/html/style/src/makefile.win @@ -47,7 +47,7 @@ REQUIRES = xpcom \ include <$(DEPTH)/config/config.mak> -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN EXPORTS = \ nsIHTMLStyleSheet.h \ diff --git a/mozilla/layout/html/table/src/Makefile.in b/mozilla/layout/html/table/src/Makefile.in index 1582224e28a..630a2aa7d7b 100644 --- a/mozilla/layout/html/table/src/Makefile.in +++ b/mozilla/layout/html/table/src/Makefile.in @@ -59,7 +59,7 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML -DDEBUG_TABLE_REFLOW_TIMING_off -DDEBUG_TABLE_STRATEGY_off +DEFINES += -DDEBUG_TABLE_REFLOW_TIMING_off -DDEBUG_TABLE_STRATEGY_off ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/layout/html/table/src/makefile.win b/mozilla/layout/html/table/src/makefile.win index f3cac192690..1866d1195d9 100644 --- a/mozilla/layout/html/table/src/makefile.win +++ b/mozilla/layout/html/table/src/makefile.win @@ -37,7 +37,7 @@ REQUIRES = xpcom \ $(NULL) -DEFINES =-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN \ +DEFINES =-DWIN32_LEAN_AND_MEAN \ -DoffDEBUG_TABLE_REFLOW_TIMING -DoffDEBUG_TABLE_REFLOW_TIMING_DETAIL \ -DoffDEBUG_TABLE_STRATEGY \ $(NULL) diff --git a/mozilla/layout/html/tests/makefile.win b/mozilla/layout/html/tests/makefile.win index b7cdb01f7fe..69bb37ad10d 100644 --- a/mozilla/layout/html/tests/makefile.win +++ b/mozilla/layout/html/tests/makefile.win @@ -32,8 +32,6 @@ MAKE_OBJ_TYPE = EXE PROG2 = .\$(OBJDIR)\TestCSSPropertyLookup.exe PROGRAMS = $(PROG2) -DEFINES = -D_IMPL_NS_HTML - LCFLAGS = \ $(LCFLAGS) \ $(DEFINES) \ diff --git a/mozilla/layout/mathml/content/src/Makefile.in b/mozilla/layout/mathml/content/src/Makefile.in index f81adfb77fc..49688f21e49 100644 --- a/mozilla/layout/mathml/content/src/Makefile.in +++ b/mozilla/layout/mathml/content/src/Makefile.in @@ -38,8 +38,6 @@ REQUIRES = xpcom \ include $(topsrcdir)/config/config.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/layout/mathml/content/src/makefile.win b/mozilla/layout/mathml/content/src/makefile.win index e4fcf4db855..2fecdcd61b8 100644 --- a/mozilla/layout/mathml/content/src/makefile.win +++ b/mozilla/layout/mathml/content/src/makefile.win @@ -32,7 +32,7 @@ REQUIRES = string \ gfx \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsMathMLAtoms.obj \ diff --git a/mozilla/layout/svg/base/src/Makefile.in b/mozilla/layout/svg/base/src/Makefile.in index bbfc06b5434..fa2ed358ae7 100644 --- a/mozilla/layout/svg/base/src/Makefile.in +++ b/mozilla/layout/svg/base/src/Makefile.in @@ -69,8 +69,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/layout/svg/base/src/makefile.win b/mozilla/layout/svg/base/src/makefile.win index 46cd9a23bce..8f1c8e95cf2 100644 --- a/mozilla/layout/svg/base/src/makefile.win +++ b/mozilla/layout/svg/base/src/makefile.win @@ -37,7 +37,7 @@ REQUIRES = xpcom \ unicharutil \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsSVGBPathBuilder.obj \ diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in index 72402b6bf9b..93954459e25 100644 --- a/mozilla/layout/xul/base/src/Makefile.in +++ b/mozilla/layout/xul/base/src/Makefile.in @@ -113,8 +113,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTML - ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/layout/xul/base/src/grid/Makefile.in b/mozilla/layout/xul/base/src/grid/Makefile.in index 77ea4d312d7..66e32e46b7e 100644 --- a/mozilla/layout/xul/base/src/grid/Makefile.in +++ b/mozilla/layout/xul/base/src/grid/Makefile.in @@ -62,8 +62,6 @@ EXPORTS = \ nsGridCell.h \ $(NULL) -DEFINES += -D_IMPL_NS_HTML - LOCAL_INCLUDES = \ -I$(srcdir) \ -I$(srcdir)/../../../base/src \ diff --git a/mozilla/layout/xul/base/src/grid/makefile.win b/mozilla/layout/xul/base/src/grid/makefile.win index d1f3aef0755..2e2ce8820a4 100644 --- a/mozilla/layout/xul/base/src/grid/makefile.win +++ b/mozilla/layout/xul/base/src/grid/makefile.win @@ -33,7 +33,7 @@ REQUIRES = xpcom \ content \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsGridLayout2.obj \ diff --git a/mozilla/layout/xul/base/src/makefile.win b/mozilla/layout/xul/base/src/makefile.win index 4927a4373f6..54430c09a09 100644 --- a/mozilla/layout/xul/base/src/makefile.win +++ b/mozilla/layout/xul/base/src/makefile.win @@ -49,7 +49,7 @@ REQUIRES = xpcom \ js \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsScrollBoxFrame.obj \ diff --git a/mozilla/layout/xul/base/src/tree/src/Makefile.in b/mozilla/layout/xul/base/src/tree/src/Makefile.in index fe5eecd1413..37d40681612 100644 --- a/mozilla/layout/xul/base/src/tree/src/Makefile.in +++ b/mozilla/layout/xul/base/src/tree/src/Makefile.in @@ -62,8 +62,6 @@ EXPORTS = \ nsTreeContentView.h \ $(NULL) -DEFINES += -D_IMPL_NS_HTML - LOCAL_INCLUDES = \ -I$(srcdir) \ -I$(srcdir)/../../../../base/src \ diff --git a/mozilla/layout/xul/base/src/tree/src/makefile.win b/mozilla/layout/xul/base/src/tree/src/makefile.win index 06b490b0feb..335bb66b65a 100644 --- a/mozilla/layout/xul/base/src/tree/src/makefile.win +++ b/mozilla/layout/xul/base/src/tree/src/makefile.win @@ -40,7 +40,7 @@ REQUIRES = xpcom \ js \ $(NULL) -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-DWIN32_LEAN_AND_MEAN CPP_OBJS= \ .\$(OBJDIR)\nsTreeBoxObject.obj \ diff --git a/mozilla/mailnews/addrbook/src/Makefile.in b/mozilla/mailnews/addrbook/src/Makefile.in index bd84d142ee5..cef28f731f2 100644 --- a/mozilla/mailnews/addrbook/src/Makefile.in +++ b/mozilla/mailnews/addrbook/src/Makefile.in @@ -122,7 +122,6 @@ CPPSRCS += \ nsAbOutlookCard.cpp \ nsAbOutlookDirFactory.cpp \ nsAbOutlookDirectory.cpp \ - nsAbQueryStringToExpression.cpp \ nsAbWinHelper.cpp \ nsMapiAddressBook.cpp \ nsWabAddressBook.cpp \ diff --git a/mozilla/mailnews/base/search/src/Makefile.in b/mozilla/mailnews/base/search/src/Makefile.in index 57ca36566d0..99b7d470ed7 100644 --- a/mozilla/mailnews/base/search/src/Makefile.in +++ b/mozilla/mailnews/base/search/src/Makefile.in @@ -71,8 +71,6 @@ EXPORTS = nsMsgFilterService.h \ nsMsgFilterDelegateFactory.h \ $(NULL) -DEFINES += -D_IMPL_NS_HTML - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/mozilla/mailnews/base/search/src/makefile.win b/mozilla/mailnews/base/search/src/makefile.win index 9913ecf0b1b..f61d3b90b6f 100644 --- a/mozilla/mailnews/base/search/src/makefile.win +++ b/mozilla/mailnews/base/search/src/makefile.win @@ -45,8 +45,6 @@ include <$(DEPTH)\config\config.mak> LIBRARY_NAME=msgsearch_s -DEFINES=-D_IMPL_NS_HTML - CPP_OBJS= .\$(OBJDIR)\nsMsgFilterService.obj \ .\$(OBJDIR)\nsMsgFilterList.obj\ .\$(OBJDIR)\nsMsgFilter.obj\ diff --git a/mozilla/mailnews/mime/cthandlers/calendar/makefile.win b/mozilla/mailnews/mime/cthandlers/calendar/makefile.win index 60d8001a042..e7688845447 100644 --- a/mozilla/mailnews/mime/cthandlers/calendar/makefile.win +++ b/mozilla/mailnews/mime/cthandlers/calendar/makefile.win @@ -57,8 +57,6 @@ REQUIRES = \ uconv \ $(NULL) -DEFINES= -DEBUG_rhp -D_IMPL_NS_HTML - #//------------------------------------------------------------------------ #// #// Define the files necessary to build the target (ie. OBJS) diff --git a/mozilla/mailnews/mime/cthandlers/glue/Makefile.in b/mozilla/mailnews/mime/cthandlers/glue/Makefile.in index 93881277af9..b14cdfd1b7a 100644 --- a/mozilla/mailnews/mime/cthandlers/glue/Makefile.in +++ b/mozilla/mailnews/mime/cthandlers/glue/Makefile.in @@ -43,8 +43,6 @@ CPPSRCS = \ nsMimeContentTypeHandler.cpp \ $(NULL) -DEFINES += -D_IMPL_NS_HTML - # glue lib should be static FORCE_STATIC_LIB = 1 diff --git a/mozilla/mailnews/mime/cthandlers/glue/makefile.win b/mozilla/mailnews/mime/cthandlers/glue/makefile.win index 95d21f9beee..53edad66d23 100644 --- a/mozilla/mailnews/mime/cthandlers/glue/makefile.win +++ b/mozilla/mailnews/mime/cthandlers/glue/makefile.win @@ -48,8 +48,6 @@ REQUIRES = xpcom \ msgbase \ $(NULL) -DEFINES= -DEBUG_rhp -D_IMPL_NS_HTML - #//------------------------------------------------------------------------ #// #// Define the files necessary to build the target (ie. OBJS) diff --git a/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in b/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in index 8de85629e16..364ad59b398 100644 --- a/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in +++ b/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in @@ -49,8 +49,6 @@ endif EXTRA_DSO_LIBS = mimecthglue_s -DEFINES += -D_IMPL_NS_HTML - CPPSRCS = \ nsSMIMEStub.cpp \ nsSMIMEStubFactory.cpp \ diff --git a/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.win b/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.win index 8b3f65d2a3e..969e1f3f593 100644 --- a/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.win +++ b/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.win @@ -48,7 +48,6 @@ REQUIRES = \ # $(NULL) -DEFINES= -D_IMPL_NS_HTML #//------------------------------------------------------------------------ #// diff --git a/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in b/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in index 94be947665c..7955bea579c 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in +++ b/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in @@ -58,8 +58,6 @@ endif EXTRA_DSO_LIBS += mimecthglue_s -DEFINES += -D_IMPL_NS_HTML - CPPSRCS = \ mimevcrd.cpp \ nsVCard.cpp \ diff --git a/mozilla/mailnews/mime/cthandlers/vcard/makefile.win b/mozilla/mailnews/mime/cthandlers/vcard/makefile.win index 7adece2d8e5..9d8b1a38767 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/makefile.win +++ b/mozilla/mailnews/mime/cthandlers/vcard/makefile.win @@ -62,7 +62,6 @@ REQUIRES = xpcom \ # $(NULL) -DEFINES= -D_IMPL_NS_HTML #//------------------------------------------------------------------------ #// diff --git a/mozilla/netwerk/streamconv/test/Makefile.in b/mozilla/netwerk/streamconv/test/Makefile.in index 7741873b3b5..2dc73e3faf4 100644 --- a/mozilla/netwerk/streamconv/test/Makefile.in +++ b/mozilla/netwerk/streamconv/test/Makefile.in @@ -45,8 +45,6 @@ LIBS = \ include $(topsrcdir)/config/rules.mk -DEFINES += -DUSE_NSREG - ifeq ($(OS_ARCH),WINNT) LDFLAGS += -SUBSYSTEM:CONSOLE ifdef MOZ_NO_DEBUG_RTL diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in index 417e90f2d60..7f9c2860445 100644 --- a/mozilla/netwerk/test/Makefile.in +++ b/mozilla/netwerk/test/Makefile.in @@ -76,8 +76,6 @@ LIBS = \ include $(topsrcdir)/config/rules.mk -DEFINES += -DUSE_NSREG - _RES_FILES = \ urlparse.dat \ urlparse_unx.dat \ diff --git a/mozilla/netwerk/test/makefile.win b/mozilla/netwerk/test/makefile.win index f2a50fa550f..2a19ffa16b2 100644 --- a/mozilla/netwerk/test/makefile.win +++ b/mozilla/netwerk/test/makefile.win @@ -55,7 +55,7 @@ $(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5) $(PROG6) $(PROG7) $(PROG8)\ $(PROGA) $(PROGB) $(PROGC) $(PROGD) $(PROGE) $(PROGF) $(PROGG)\ $(PROGH) $(PROGI) $(PROGJ) $(PROGK) -LCFLAGS=-DUSE_NSREG -GX +LCFLAGS=-GX INCS = $(INCS) \ diff --git a/mozilla/parser/htmlparser/macbuild/htmlparser.xml b/mozilla/parser/htmlparser/macbuild/htmlparser.xml index c90f017aa82..109dfe92557 100644 --- a/mozilla/parser/htmlparser/macbuild/htmlparser.xml +++ b/mozilla/parser/htmlparser/macbuild/htmlparser.xml @@ -479,7 +479,7 @@ MWFrontEnd_C_onlystdkeywords0 MWFrontEnd_C_enumsalwaysint1 MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnamehtmlparserSharedPrefix_debug.h + MWFrontEnd_C_prefixnameMacSharedPrefix_debug.h MWFrontEnd_C_ansistrict0 MWFrontEnd_C_mpwcnewline0 MWFrontEnd_C_wchar_type1 @@ -1722,7 +1722,7 @@ MWFrontEnd_C_onlystdkeywords0 MWFrontEnd_C_enumsalwaysint1 MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnamehtmlparserSharedPrefix.h + MWFrontEnd_C_prefixnameMacSharedPrefix.h MWFrontEnd_C_ansistrict0 MWFrontEnd_C_mpwcnewline0 MWFrontEnd_C_wchar_type1 diff --git a/mozilla/parser/htmlparser/robot/test/Makefile.in b/mozilla/parser/htmlparser/robot/test/Makefile.in index b5c83682c4c..df102c08b4b 100644 --- a/mozilla/parser/htmlparser/robot/test/Makefile.in +++ b/mozilla/parser/htmlparser/robot/test/Makefile.in @@ -50,8 +50,6 @@ include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk -DEFINES += -DUSE_NSREG - ifdef ($(OS_ARCH),WINNT) ifdef GNU_CC LDFLAGS += -SUBSYSTEM:CONSOLE diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in index fc7750201f6..b206084428e 100644 --- a/mozilla/parser/htmlparser/src/Makefile.in +++ b/mozilla/parser/htmlparser/src/Makefile.in @@ -92,7 +92,7 @@ EXTRA_DSO_LDOPTS += \ include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_HTMLPARS -DXML_DTD +DEFINES += -DXML_DTD ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/parser/htmlparser/src/makefile.win b/mozilla/parser/htmlparser/src/makefile.win index 034a1ea4ef0..188002c265e 100644 --- a/mozilla/parser/htmlparser/src/makefile.win +++ b/mozilla/parser/htmlparser/src/makefile.win @@ -38,7 +38,7 @@ REQUIRES = xpcom \ include <$(DEPTH)\config\config.mak> LIBRARY_NAME=raptorhtmlpars -DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN -DXML_DTD +DEFINES=-DWIN32_LEAN_AND_MEAN -DXML_DTD LIBRARY_NAME = gkparser MODULE_NAME = nsParserModule diff --git a/mozilla/rdf/base/public/rdf.h b/mozilla/rdf/base/public/rdf.h index 6b47de1a019..678537bba97 100644 --- a/mozilla/rdf/base/public/rdf.h +++ b/mozilla/rdf/base/public/rdf.h @@ -111,18 +111,4 @@ static const char* kURI##prefix##_##name = ns #name /*@}*/ -#ifdef _IMPL_NS_RDF -#if defined(XP_PC) && !defined(XP_OS2_EMX) -#define NS_RDF _declspec(dllexport) -#else /* !XP_PC */ -#define NS_RDF -#endif /* !XP_PC */ -#else /* !_IMPL_NS_RDF */ -#if defined(XP_PC) && !defined(XP_OS2_EMX) -#define NS_RDF _declspec(dllimport) -#else /* !XP_PC */ -#define NS_RDF -#endif /* !XP_PC */ -#endif /* !_IMPL_NS_RDF */ - #endif /* rdf_h___ */ diff --git a/mozilla/rdf/util/src/makefile.win b/mozilla/rdf/util/src/makefile.win index d5fcfc2c226..91f33069528 100644 --- a/mozilla/rdf/util/src/makefile.win +++ b/mozilla/rdf/util/src/makefile.win @@ -21,7 +21,7 @@ DEPTH=..\..\.. -LCFLAGS=-DUSE_XPIDL_INTERFACES -D_IMPL_NS_RDF +LCFLAGS=-DUSE_XPIDL_INTERFACES MODULE=rdfutil LIBRARY_NAME=rdfutil_s diff --git a/mozilla/view/macbuild/view.xml b/mozilla/view/macbuild/view.xml index ce1f1d810c7..3429b8a4fd1 100644 --- a/mozilla/view/macbuild/view.xml +++ b/mozilla/view/macbuild/view.xml @@ -469,7 +469,7 @@ MWFrontEnd_C_onlystdkeywords0 MWFrontEnd_C_enumsalwaysint1 MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnameviewSharedPrefix_debug.h + MWFrontEnd_C_prefixnameMacSharedPrefix_debug.h MWFrontEnd_C_ansistrict0 MWFrontEnd_C_mpwcnewline0 MWFrontEnd_C_wchar_type1 @@ -1474,7 +1474,7 @@ MWFrontEnd_C_onlystdkeywords0 MWFrontEnd_C_enumsalwaysint1 MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnameviewSharedPrefix.h + MWFrontEnd_C_prefixnameMacSharedPrefix.h MWFrontEnd_C_ansistrict0 MWFrontEnd_C_mpwcnewline0 MWFrontEnd_C_wchar_type1 diff --git a/mozilla/view/src/Makefile.in b/mozilla/view/src/Makefile.in index e64fe963e34..8ac500bb05c 100644 --- a/mozilla/view/src/Makefile.in +++ b/mozilla/view/src/Makefile.in @@ -61,6 +61,3 @@ EXTRA_DSO_LDOPTS = \ $(NULL) include $(topsrcdir)/config/rules.mk - -DEFINES += -D_IMPL_NS_VIEW - diff --git a/mozilla/view/src/makefile.win b/mozilla/view/src/makefile.win index bf4bc77e21c..90436b275e0 100644 --- a/mozilla/view/src/makefile.win +++ b/mozilla/view/src/makefile.win @@ -36,7 +36,7 @@ REQUIRES = xpcom \ necko \ $(NULL) -DEFINES =-D_IMPL_NS_VIEW -DWIN32_LEAN_AND_MEAN +DEFINES =-DWIN32_LEAN_AND_MEAN OBJS = \ .\$(OBJDIR)\nsView.obj \ @@ -47,11 +47,6 @@ OBJS = \ $(NULL) -LCFLAGS = \ - $(LCFLAGS) \ - -D_IMPL_NS_VIEW \ - $(NULL) - LLIBS= \ $(DIST)\lib\xpcom.lib \ $(DIST)\lib\gkgfx.lib \ diff --git a/mozilla/xpcom/base/nsComObsolete.h b/mozilla/xpcom/base/nsComObsolete.h index ec6ee39162a..37b5b5cc55c 100644 --- a/mozilla/xpcom/base/nsComObsolete.h +++ b/mozilla/xpcom/base/nsComObsolete.h @@ -43,12 +43,6 @@ #define NS_WIDGET NS_IMPORT #endif -#ifdef _IMPL_NS_VIEW -#define NS_VIEW NS_EXPORT -#else -#define NS_VIEW NS_IMPORT -#endif - #ifdef _IMPL_NS_GFXNONXP #define NS_GFXNONXP NS_EXPORT #define NS_GFXNONXP_(type) NS_EXPORT_(type) diff --git a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in index de55cd28a12..de043d2bb52 100644 --- a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in +++ b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in @@ -40,8 +40,6 @@ LIBS = \ include $(topsrcdir)/config/rules.mk -DEFINES += -DUSE_NSREG - # For _write(). ifeq ($(OS_ARCH),BSD_OS) OS_LIBS += -lgcc diff --git a/mozilla/xpcom/reflect/xptcall/tests/makefile.win b/mozilla/xpcom/reflect/xptcall/tests/makefile.win index 63b006d91a4..dea56e7e73d 100644 --- a/mozilla/xpcom/reflect/xptcall/tests/makefile.win +++ b/mozilla/xpcom/reflect/xptcall/tests/makefile.win @@ -28,7 +28,7 @@ MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestXPTCInvoke.exe PROGRAMS = $(PROG1) -LCFLAGS=-DUSE_NSREG -DWIN32_LEAN_AND_MEAN +LCFLAGS=-DWIN32_LEAN_AND_MEAN LLIBS= \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in b/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in index 35fd295fd96..a1d1afc0243 100644 --- a/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in +++ b/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in @@ -39,7 +39,7 @@ LIBS = \ include $(topsrcdir)/config/rules.mk -DEFINES += -DUSE_NSREG -DEXPORT_XPTI_API +DEFINES += -DEXPORT_XPTI_API ifeq ($(OS_ARCH), WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/xpcom/reflect/xptinfo/tests/makefile.win b/mozilla/xpcom/reflect/xptinfo/tests/makefile.win index c2130ff839b..6b3d7aa874a 100644 --- a/mozilla/xpcom/reflect/xptinfo/tests/makefile.win +++ b/mozilla/xpcom/reflect/xptinfo/tests/makefile.win @@ -28,7 +28,7 @@ MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestInterfaceInfo.exe PROGRAMS = $(PROG1) -LCFLAGS=-DUSE_NSREG -DEXPORT_XPTI_API -DWIN32_LEAN_AND_MEAN +LCFLAGS=-DEXPORT_XPTI_API -DWIN32_LEAN_AND_MEAN LLIBS= \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in index 0822ecd63b6..eca98de2ef9 100644 --- a/mozilla/xpcom/tests/Makefile.in +++ b/mozilla/xpcom/tests/Makefile.in @@ -75,7 +75,6 @@ endif include $(topsrcdir)/config/rules.mk -DEFINES += -DUSE_NSREG LOCAL_INCLUDES = \ -I$(srcdir)/../ds \ -I$(srcdir)/services \ diff --git a/mozilla/xpcom/tests/makefile.win b/mozilla/xpcom/tests/makefile.win index 0d1f31f5d0a..9c4b895ce9b 100644 --- a/mozilla/xpcom/tests/makefile.win +++ b/mozilla/xpcom/tests/makefile.win @@ -75,7 +75,7 @@ PROGRAMS = $(PROG1) \ $(PROG24) \ $(NULL) -LCFLAGS=-DUSE_NSREG -GX +LCFLAGS=-GX LINCS= \ diff --git a/mozilla/xpcom/tools/registry/Makefile.in b/mozilla/xpcom/tools/registry/Makefile.in index 40ddf61e964..2216793942f 100644 --- a/mozilla/xpcom/tools/registry/Makefile.in +++ b/mozilla/xpcom/tools/registry/Makefile.in @@ -40,5 +40,3 @@ LIBS = \ include $(topsrcdir)/config/rules.mk -DEFINES += -DUSE_NSREG - diff --git a/mozilla/xpcom/typelib/xpt/tests/Makefile.in b/mozilla/xpcom/typelib/xpt/tests/Makefile.in index a748ef04d09..af2c1936ea8 100644 --- a/mozilla/xpcom/typelib/xpt/tests/Makefile.in +++ b/mozilla/xpcom/typelib/xpt/tests/Makefile.in @@ -40,7 +40,7 @@ LIBS = \ include $(topsrcdir)/config/rules.mk -DEFINES += -DEXPORT_XPT_API -DUSE_NSREG +DEFINES += -DEXPORT_XPT_API ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/mozilla/xpcom/typelib/xpt/tests/makefile.win b/mozilla/xpcom/typelib/xpt/tests/makefile.win index 183c343cb18..b0ffd7ca97a 100644 --- a/mozilla/xpcom/typelib/xpt/tests/makefile.win +++ b/mozilla/xpcom/typelib/xpt/tests/makefile.win @@ -29,7 +29,7 @@ PROG1 = .\$(OBJDIR)\PrimitiveTest.exe PROG2 = .\$(OBJDIR)\SimpleTypeLib.exe PROGRAMS = $(PROG1) $(PROG2) -LCFLAGS=-DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API -DUSE_NSREG +LCFLAGS=-DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API LLIBS= \ $(DIST)\lib\xpcomxpt_s.lib \ diff --git a/mozilla/xpcom/typelib/xpt/tools/Makefile.in b/mozilla/xpcom/typelib/xpt/tools/Makefile.in index d1e6b95c9a5..af978c178fc 100644 --- a/mozilla/xpcom/typelib/xpt/tools/Makefile.in +++ b/mozilla/xpcom/typelib/xpt/tools/Makefile.in @@ -43,7 +43,7 @@ include $(topsrcdir)/config/rules.mk # Compile directly against the static lib, so we can use the tools # during the build without the shared library path being set. ifeq ($(OS_ARCH),WINNT) -DEFINES += -DUSE_NSREG -DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API +DEFINES += -DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API endif LIBS = $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) diff --git a/mozilla/xpcom/typelib/xpt/tools/makefile.win b/mozilla/xpcom/typelib/xpt/tools/makefile.win index 6c68b22778c..a658ce5cb9f 100644 --- a/mozilla/xpcom/typelib/xpt/tools/makefile.win +++ b/mozilla/xpcom/typelib/xpt/tools/makefile.win @@ -29,7 +29,7 @@ PROG1 = .\$(OBJDIR)\xpt_dump.exe PROG2 = .\$(OBJDIR)\xpt_link.exe PROGRAMS = $(PROG1) $(PROG2) -LCFLAGS=-DUSE_NSREG -DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API +LCFLAGS=-DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API LLIBS= \ $(DIST)\lib\xpcomxpt_s.lib \