Removing unused NS_DOM/_IMPL_NS_DOM and NS_INTL/_IMPL_NS_INTL defines (bugs 160248 and 160253). Patch for 160248 by walk84@yahoo.com, r=me&cls; patch for 160253 by me, r=cls.

2002-07-31 20:53:46 +00:00 · 2002-07-31 20:53:46 +00:00 · 4d7d4c4470
--- a/config/config.mak
+++ b/config/config.mak
@ -207,11 +207,9 @@ FINAL_LINK_LIBS=$(DIST)\final-link-libs
 # building them into the executable.
 CFLAGS=$(CFLAGS) -D_IMPL_NS_APPSHELL
 CFLAGS=$(CFLAGS) -D_IMPL_NS_COOKIE
-CFLAGS=$(CFLAGS) -D_IMPL_NS_DOM
 CFLAGS=$(CFLAGS) -D_IMPL_NS_GFX
 CFLAGS=$(CFLAGS) -D_IMPL_NS_HTML
 CFLAGS=$(CFLAGS) -D_IMPL_NS_HTMLPARS
-CFLAGS=$(CFLAGS) -D_IMPL_NS_INTL
 CFLAGS=$(CFLAGS) -D_IMPL_NS_LAYOUT
 CFLAGS=$(CFLAGS) -D_IMPL_NS_MSG_BASE
 CFLAGS=$(CFLAGS) -D_IMPL_NS_PICS
--- a/config/config.mk
+++ b/config/config.mk
@ -399,11 +399,9 @@ ifdef MOZ_STATIC_COMPONENT_LIBS
 DEFINES	+= \
 	-D_IMPL_NS_APPSHELL \
 	-D_IMPL_NS_COOKIE \
-	-D_IMPL_NS_DOM \
 	-D_IMPL_NS_GFX \
 	-D_IMPL_NS_HTML \
 	-D_IMPL_NS_HTMLPARS \
-	-D_IMPL_NS_INTL \
 	-D_IMPL_NS_LAYOUT \
 	-D_IMPL_NS_MSG_BASE \
 	-D_IMPL_NS_PICS \
--- a/dom/macbuild/domSharedPrefix.h
+++ b/dom/macbuild/domSharedPrefix.h
@ -20,8 +20,6 @@
 * Contributor(s): 
 */

-/* Defining the following causes NS_DOM to be defined as NS_EXPORT. */
-#define _IMPL_NS_DOM
 #define MOZ_XUL 1
 #define INCLUDE_XUL 1

--- a/dom/macbuild/domSharedPrefix_debug.h
+++ b/dom/macbuild/domSharedPrefix_debug.h
@ -20,8 +20,6 @@
 * Contributor(s): 
 */

-/* Defining the following causes NS_DOM to be defined as NS_EXPORT. */
-#define _IMPL_NS_DOM
 #define MOZ_XUL 1
 #define INCLUDE_XUL 1

--- a/dom/public/base/makefile.win
+++ b/dom/public/base/makefile.win
@ -1,31 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-
-DEFINES=-D_IMPL_NS_DOM 
-EXPORTS=nsPIDOMWindow.h nsPIWindowRoot.h nsIFocusController.h
-
-MODULE=dom 
-
-include <$(DEPTH)\config\rules.mak>
-
--- a/dom/public/coreEvents/makefile.win
+++ b/dom/public/coreEvents/makefile.win
@ -1,49 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-
-DEFINES=-D_IMPL_NS_DOM
-
-EXPORTS =				\
-	nsIDOMEventCapturer.h		\
-	nsIDOMEventReceiver.h		\
-	nsIDOMFocusListener.h		\
-	nsIDOMFormListener.h		\
-	nsIDOMKeyListener.h		\
-	nsIDOMLoadListener.h		\
-	nsIDOMMouseListener.h		\
-	nsIDOMMouseMotionListener.h	\
-	nsIDOMMutationListener.h	\
-	nsIDOMPaintListener.h		\
-	nsIDOMDragListener.h		\
-	nsIDOMTextListener.h		\
-	nsIDOMCompositionListener.h	\
-	nsIDOMXULListener.h		\
-	nsIDOMScrollListener.h		\
-	nsIDOMContextMenuListener.h	\
-	$(NULL)
-
-MODULE=dom
-
-include <$(DEPTH)\config\rules.mak>
-
--- a/dom/src/base/Makefile.in
+++ b/dom/src/base/Makefile.in
@ -84,8 +84,6 @@ include $(topsrcdir)/config/rules.mk

 CXXFLAGS        += -I$(srcdir) -I$(srcdir)/../build

-DEFINES		+= -D_IMPL_NS_DOM
-
 ifdef NS_TRACE_MALLOC
 DEFINES		+= -DNS_TRACE_MALLOC
 endif
--- a/dom/src/base/makefile.win
+++ b/dom/src/base/makefile.win
@ -1,94 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-
-LIBRARY_NAME=jsdombase_s 
-
-DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
-
-LINCS= -I..\build
-REQUIRES	= xpcom \
-		  string \
-		  webBrowser_core \
-		  js \
-		  widget \
-		  gfx \
-		  layout \
-		  layout_xul \
-		  content \
-		  content_xul \
-		  caps \
-		  docshell \
-		  xpconnect \
-		  pref \
-		  oji \
-		  necko \
-		  java \
-		  locale \
-		  uriloader \
-		  sidebar \
-		  webshell \
-		  view \
-		  uconv \
-		  shistory \
-		  plugin \
-		  windowwatcher \
-		  htmlparser \
-		  chardet \
-		  find \
-		  appshell \
-		  intl \
-		  $(NULL)
-
-MODULE=dom
-
-
-CPP_OBJS= \
-	.\$(OBJDIR)\nsBarProps.obj		\
-	.\$(OBJDIR)\nsDOMException.obj		\
-	.\$(OBJDIR)\nsJSEnvironment.obj		\
-	.\$(OBJDIR)\nsFocusController.obj	\
-	.\$(OBJDIR)\nsGlobalWindow.obj		\
-	.\$(OBJDIR)\nsLocation.obj		\
-	.\$(OBJDIR)\nsDOMWindowList.obj		\
-	.\$(OBJDIR)\nsJSUtils.obj		\
-	.\$(OBJDIR)\nsScreen.obj		\
-	.\$(OBJDIR)\nsHistory.obj		\
-	.\$(OBJDIR)\nsMimeTypeArray.obj		\
-	.\$(OBJDIR)\nsPluginArray.obj		\
-	.\$(OBJDIR)\nsWindowRoot.obj		\
-	.\$(OBJDIR)\nsDOMClassInfo.obj		\
-	$(NULL)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-libs:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
--- a/dom/src/build/Makefile.in
+++ b/dom/src/build/Makefile.in
@ -70,6 +70,5 @@ EXTRA_DSO_LDOPTS = \

 include $(topsrcdir)/config/rules.mk

-CFLAGS		+= -D_IMPL_NS_DOM
 INCLUDES	+= -I$(srcdir)/../base

--- a/dom/src/build/makefile.win
+++ b/dom/src/build/makefile.win
@ -1,70 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-MODULE=dom
-REQUIRES	= xpcom \
-		  string \
-		  js \
-		  xpconnect \
-		  widget \
-		  layout \
-		  caps \
-		  webBrowser_core \
-		  docshell \
-		  sidebar \
-		  plugin \
-		  necko \
-		  gfx \
-		  content \
-		  content_xul \
-		  intl \
-		  $(NULL)
-include <$(DEPTH)/config/config.mak>
-
-DEFINES=-D_IMPL_NS_DOM
-LINCS=-I..\base
-
-CPP_OBJS = .\$(OBJDIR)\nsDOMFactory.obj			\
-	   .\$(OBJDIR)\nsScriptNameSpaceManager.obj 
-
-
-LIBRARY_NAME=jsdom
-MODULE_NAME=DOM_components
-
-LCFLAGS = \
-        $(DEFINES) \
-        $(INCLUDES) \
-        $(NULL)
-
-# These are the libraries we need to link with to create the dll
-SUB_LIBRARIES=                                          \
-	$(DIST)\lib\jsdombase_s.lib			\
-	$(DIST)\lib\jsdomevents_s.lib			\
-        $(NULL)
-
-LLIBS=							\
-	$(DIST)\lib\gkgfx.lib				\
-	$(DIST)\lib\js32$(VERSION_NUMBER).lib		\
-	$(DIST)\lib\xpcom.lib				\
-	$(LIBNSPR)
-
-include <$(DEPTH)\config\rules.mak>
--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@ -49,8 +49,6 @@ include $(topsrcdir)/config/rules.mk

 INCLUDES	+= -I$(srcdir)/../base

-DEFINES		+= -D_IMPL_NS_DOM
-
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/dom/src/events/makefile.win
+++ b/dom/src/events/makefile.win
@ -1,60 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-
-LIBRARY_NAME=jsdomevents_s
-MODULE=dom
-REQUIRES	= xpcom \
-		  string \
-		  js \
-		  caps \
-		  xpconnect \
-		  content \
-		  widget \
-		  gfx \
-		  $(NULL)
-
-DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
-
-LINCS= -I..\base
-
-CPPSRCS =				\
-	nsJSEventListener.cpp		\
-	$(NULL)
-
-CPP_OBJS= \
-	.\$(OBJDIR)\nsJSEventListener.obj	\
-	$(NULL)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-libs:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
--- a/dom/src/jsurl/macbuild/JSUrl.xml
+++ b/dom/src/jsurl/macbuild/JSUrl.xml
--- a/dom/src/jsurl/macbuild/JSUrlPrefix.h
+++ b/dom/src/jsurl/macbuild/JSUrlPrefix.h
--- a/dom/src/jsurl/macbuild/JSUrlPrefix_debug.h
+++ b/dom/src/jsurl/macbuild/JSUrlPrefix_debug.h
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@ -75,8 +75,6 @@ libs::
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE) $(DESTDIR)$(mozappdir)/res

-DEFINES	+= -D_IMPL_NS_INTL
-
 ifeq ($(OS_ARCH),WINNT)
 DEFINES	+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/intl/locale/src/makefile.win
+++ b/intl/locale/src/makefile.win
@ -1,58 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH		= ..\..\..
-
-DEFINES		= -D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
-
-MODULE		= locale
-REQUIRES	= xpcom \
-		  gfx \
-		  string \
-		  uconv \
-		  unicharutil \
-		  intl \
-		  $(NULL)
-LIBRARY_NAME	= nslocale_s
-
-DIRS		= windows
-
-CPP_OBJS	= .\$(OBJDIR)\nsLocale.obj			\
-		  .\$(OBJDIR)\nsLocaleService.obj		\
-		  .\$(OBJDIR)\nsFontPackageService.obj		\
-		  .\$(OBJDIR)\nsLanguageAtomService.obj		\
-		  .\$(OBJDIR)\nsScriptableDateFormat.obj	\
-		  .\$(OBJDIR)\nsCollation.obj			\
-		  $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-libs:: $(DLL)
-	$(MAKE_INSTALL) langGroups.properties $(DIST)\bin\res
-	$(MAKE_INSTALL) language.properties $(DIST)\bin\res
-
-clobber::
-	rm -f $(DIST)\bin\res\langGroups.properties
-	rm -f $(DIST)\bin\res\language.properties
-
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@ -118,7 +118,7 @@ endif

 include $(topsrcdir)/config/rules.mk

-CFLAGS		+= -DUSE_NSREG -D_IMPL_NS_INTL
+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.
--- a/intl/uconv/src/makefile.win
+++ b/intl/uconv/src/makefile.win
@ -1,99 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-MODULE=uconv
-REQUIRES	= xpcom \
-		  string \
-		  intl \
-		  locale \
-		  unicharutil \
-		  chardet \
-		  $(NULL)
-include <$(DEPTH)/config/config.mak>
-
-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
-
-LIBRARY_NAME=uconv
-MODULE_NAME=nsUConvModule
-
-CPP_OBJS=						\
-	.\$(OBJDIR)\nsTextToSubURI.obj			\
-	.\$(OBJDIR)\nsCharsetConverterManager.obj 	\
-	.\$(OBJDIR)\nsUnicodeDecodeHelper.obj 		\
-	.\$(OBJDIR)\nsUnicodeEncodeHelper.obj 		\
-	.\$(OBJDIR)\nsWinCharset.obj 			\
-	.\$(OBJDIR)\nsCharsetAliasImp.obj 		\
-	.\$(OBJDIR)\nsUConvModule.obj 			\
-	.\$(OBJDIR)\nsMappingCache.obj 			\
-	.\$(OBJDIR)\nsURLProperties.obj 		\
-	.\$(OBJDIR)\nsISO88591ToUnicode.obj			\
-	.\$(OBJDIR)\nsCP1252ToUnicode.obj			\
-	.\$(OBJDIR)\nsMacRomanToUnicode.obj			\
-	.\$(OBJDIR)\nsUTF8ToUnicode.obj			\
-	.\$(OBJDIR)\nsUnicodeToISO88591.obj			\
-	.\$(OBJDIR)\nsUnicodeToCP1252.obj			\
-	.\$(OBJDIR)\nsUnicodeToMacRoman.obj			\
-	.\$(OBJDIR)\nsUnicodeToUTF8.obj			\
-	.\$(OBJDIR)\nsUCvMinSupport.obj			\
-	.\$(OBJDIR)\nsScriptableUConv.obj	\
-	.\$(OBJDIR)\nsConverterInputStream.obj	\
-	$(NULL)
-
-CSRCS =		\
-	umap.c	\
-	ugen.c	\
-	uscan.c	\
-	$(NULL)
-
-OBJS = 				\
-        .\$(OBJDIR)\umap.obj	\
-        .\$(OBJDIR)\ugen.obj	\
-        .\$(OBJDIR)\uscan.obj	\
-        $(NULL)
-
-EXPORTS=				\
-	$(NULL)
-
-
-
-LLIBS=					\
- $(DIST)\lib\xpcom.lib		\
- $(DIST)\lib\unicharutil_s.lib \
- $(LIBNSPR)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-libs::
-	$(MAKE_INSTALL) .\charsetalias.properties $(DIST)\bin\res
-	$(MAKE_INSTALL) .\wincharset.properties $(DIST)\bin\res
-	$(MAKE_INSTALL) charsetData.properties $(DIST)\bin\res
-
-clobber::
-	rm -f $(DIST)\bin\res\charsetalias.properties
-	rm -f $(DIST)\bin\res\wincharset.properties
-	rm -f $(DIST)\bin\res\charsetData.properties
-    
--- a/intl/uconv/ucvcn/Makefile.in
+++ b/intl/uconv/ucvcn/Makefile.in
@ -61,8 +61,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_INTL
-
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/intl/uconv/ucvcn/makefile.win
+++ b/intl/uconv/ucvcn/makefile.win
@ -1,64 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
-
-MODULE=uconv
-REQUIRES	= xpcom \
-		  string \
-		  unicharutil \
-		  $(NULL)
-LIBRARY_NAME=ucvcn
-MODULE_NAME=nsUCvCnModule
-
-CPP_OBJS=						\
-	.\$(OBJDIR)\nsGB2312ToUnicodeV2.obj 		\
-	.\$(OBJDIR)\nsUnicodeToGB2312V2.obj		\
-	.\$(OBJDIR)\nsUnicodeToGB2312GL.obj		\
-	.\$(OBJDIR)\nsGBKToUnicode.obj 		\
-	.\$(OBJDIR)\nsUnicodeToGBK.obj		\
-	.\$(OBJDIR)\nsUnicodeToGBKNoAscii.obj		\
-	.\$(OBJDIR)\nsISO2022CNToUnicode.obj 		\
-	.\$(OBJDIR)\nsUnicodeToISO2022CN.obj		\
-	.\$(OBJDIR)\nsHZToUnicode.obj 		\
-	.\$(OBJDIR)\nsUnicodeToHZ.obj		\
-	.\$(OBJDIR)\nsCP936ToUnicode.obj 		\
-	.\$(OBJDIR)\nsUnicodeToCP936.obj		\
-	.\$(OBJDIR)\nsUCvCnSupport.obj			\
-	.\$(OBJDIR)\nsUCvCnModule.obj 			\
-	.\$(OBJDIR)\nsGBKConvUtil.obj 			\
-	$(NULL)
-
-EXPORTS=nsUCvCnCID.h			\
-	$(NULL)
-
-LLIBS=					\
- $(DIST)\lib\xpcom.lib		\
- $(LIBNSPR)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
--- a/intl/uconv/ucvibm/Makefile.in
+++ b/intl/uconv/ucvibm/Makefile.in
@ -80,7 +80,6 @@ endif

 include $(topsrcdir)/config/rules.mk

-DEFINES	+= -D_IMPL_NS_INTL
 ifeq ($(OS_ARCH),WINNT)
 DEFINES += -DWIN32_LEAN_AND_MEAN
 endif
--- a/intl/uconv/ucvibm/makefile.win
+++ b/intl/uconv/ucvibm/makefile.win
@ -1,76 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-# IBM Corporation
-#
-# This Original Code has been modified by IBM Corporation.
-# Modifications made by IBM described herein are
-# Copyright (c) International Business Machines
-# Corporation, 1999
-#
-# Modifications to Mozilla code or documentation
-# identified per MPL Section 3.3
-#
-# Date         Modified by     Description of modification
-# 12/09/1999   IBM Corp.       Support for IBM codepages - 850,852,855,857,862,864
-
-DEPTH=..\..\..
-
-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
-
-MODULE=uconv
-REQUIRES	= xpcom \
-		  string \
-		  $(NULL)
-LIBRARY_NAME=ucvibm
-MODULE_NAME=nsUCvIBMModule
-
-CPP_OBJS=						\
-	.\$(OBJDIR)\nsCP850ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP852ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP855ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP857ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP862ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP864ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP864iToUnicode.obj 		\
-	.\$(OBJDIR)\nsUnicodeToCP850.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP852.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP855.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP857.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP862.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP864.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP864i.obj		\
-	.\$(OBJDIR)\nsUCvIBMSupport.obj		\
-	.\$(OBJDIR)\nsUCvIBMModule.obj 			\
-	$(NULL)
-
-EXPORTS=nsUCvIBMCID.h			\
-	$(NULL)
-
-LLIBS=					\
- $(DIST)\lib\xpcom.lib		\
- $(LIBNSPR)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
--- a/intl/uconv/ucvja/makefile.win
+++ b/intl/uconv/ucvja/makefile.win
@ -1,60 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
-
-MODULE=uconv
-REQUIRES	= xpcom \
-		  string \
-		  $(NULL)
-LIBRARY_NAME=ucvja
-MODULE_NAME=nsUCvJAModule
-
-CPP_OBJS=						\
-	.\$(OBJDIR)\nsJapaneseToUnicode.obj 			\
-	.\$(OBJDIR)\nsUnicodeToSJIS.obj			\
-	.\$(OBJDIR)\nsCP932ToUnicode.obj 			\
-	.\$(OBJDIR)\nsUnicodeToCP932.obj			\
-	.\$(OBJDIR)\nsUCvJaSupport.obj			\
-	.\$(OBJDIR)\nsUCvJaModule.obj 			\
-        .\$(OBJDIR)\nsUnicodeToEUCJP.obj        \
-        .\$(OBJDIR)\nsUnicodeToJISx0201.obj     \
-        .\$(OBJDIR)\nsUnicodeToJISx0208.obj     \
-        .\$(OBJDIR)\nsUnicodeToJISx0212.obj     \
-        .\$(OBJDIR)\nsUnicodeToISO2022JP.obj    \
-	$(NULL)
-
-EXPORTS= nsUCVJACID.h			\
-         nsUCVJA2CID.h                  \
-	$(NULL)
-
-LLIBS=					\
- $(DIST)\lib\xpcom.lib		\
- $(LIBNSPR)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
--- a/intl/uconv/ucvko/Makefile.in
+++ b/intl/uconv/ucvko/Makefile.in
@ -58,7 +58,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_INTL
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/intl/uconv/ucvko/makefile.win
+++ b/intl/uconv/ucvko/makefile.win
@ -1,61 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
-
-MODULE=uconv
-REQUIRES	= xpcom \
-		  string \
-		  $(NULL)
-LIBRARY_NAME=ucvko
-MODULE_NAME=nsUCvKoModule
-
-CPP_OBJS=						\
-	.\$(OBJDIR)\nsEUCKRToUnicode.obj 		\
-	.\$(OBJDIR)\nsUnicodeToEUCKR.obj		\
-	.\$(OBJDIR)\nsUnicodeToKSC5601.obj		\
-	.\$(OBJDIR)\nsISO2022KRToUnicode.obj 		\
-	.\$(OBJDIR)\nsUnicodeToISO2022KR.obj		\
-	.\$(OBJDIR)\nsCP949ToUnicode.obj 		\
-	.\$(OBJDIR)\nsUnicodeToCP949.obj		\
-	.\$(OBJDIR)\nsUnicodeToX11Johab.obj		\
-	.\$(OBJDIR)\nsJohabToUnicode.obj		\
-	.\$(OBJDIR)\nsUnicodeToJohab.obj		\
-	.\$(OBJDIR)\nsUnicodeToJohabNoAscii.obj		\
-	.\$(OBJDIR)\nsUCvKOSupport.obj			\
-	.\$(OBJDIR)\nsUCvKoModule.obj 			\
-	$(NULL)
-
-EXPORTS=nsUCvKOCID.h			\
-	$(NULL)
-
-LLIBS=					\
- $(DIST)\lib\xpcom.lib		\
- $(LIBNSPR)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@ -171,7 +171,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_INTL
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/intl/uconv/ucvlatin/makefile.win
+++ b/intl/uconv/ucvlatin/makefile.win
@ -1,174 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
-
-MODULE=uconv
-LIBRARY_NAME=ucvlatin
-MODULE_NAME=nsUCvLatinModule
-REQUIRES	= xpcom \
-		  string \
-		  $(NULL)
-
-CPP_OBJS=						\
-	.\$(OBJDIR)\nsUEscapeToUnicode.obj 		\
-	.\$(OBJDIR)\nsAsciiToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO88592ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO88593ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO88594ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO88595ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO88596EToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO88596IToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO88596ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO88597ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO88598ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO88598EToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO88598IToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO88599ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO885910ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO885913ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO885914ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO885915ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISO885916ToUnicode.obj 		\
-	.\$(OBJDIR)\nsISOIR111ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP1250ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP1251ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP1253ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP1254ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP1255ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP1256ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP1257ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP1258ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP874ToUnicode.obj 		\
-	.\$(OBJDIR)\nsCP866ToUnicode.obj 		\
-	.\$(OBJDIR)\nsKOI8RToUnicode.obj 		\
-	.\$(OBJDIR)\nsKOI8UToUnicode.obj 		\
-	.\$(OBJDIR)\nsMacCEToUnicode.obj 		\
-	.\$(OBJDIR)\nsMacGreekToUnicode.obj 		\
-	.\$(OBJDIR)\nsMacTurkishToUnicode.obj 		\
-	.\$(OBJDIR)\nsUTF7ToUnicode.obj 		\
-	.\$(OBJDIR)\nsMUTF7ToUnicode.obj 		\
-	.\$(OBJDIR)\nsUCS2BEToUnicode.obj 		\
-	.\$(OBJDIR)\nsUCS2LEToUnicode.obj 		\
-	.\$(OBJDIR)\nsUCS4BEToUnicode.obj 		\
-	.\$(OBJDIR)\nsUCS4LEToUnicode.obj 		\
-	.\$(OBJDIR)\nsT61ToUnicode.obj 		\
-	.\$(OBJDIR)\nsMacCroatianToUnicode.obj		\
-	.\$(OBJDIR)\nsMacRomanianToUnicode.obj		\
-	.\$(OBJDIR)\nsMacCyrillicToUnicode.obj		\
-	.\$(OBJDIR)\nsMacUkrainianToUnicode.obj		\
-	.\$(OBJDIR)\nsMacIcelandicToUnicode.obj		\
-	.\$(OBJDIR)\nsMacArabicToUnicode.obj		\
-	.\$(OBJDIR)\nsMacDevanagariToUnicode.obj	\
-	.\$(OBJDIR)\nsMacGujaratiToUnicode.obj		\
-	.\$(OBJDIR)\nsMacGurmukhiToUnicode.obj		\
-	.\$(OBJDIR)\nsMacHebrewToUnicode.obj		\
-	.\$(OBJDIR)\nsMacFarsiToUnicode.obj		\
-	.\$(OBJDIR)\nsGEOSTD8ToUnicode.obj		\
-	.\$(OBJDIR)\nsARMSCII8ToUnicode.obj		\
-	.\$(OBJDIR)\nsTCVN5712ToUnicode.obj		\
-	.\$(OBJDIR)\nsVISCIIToUnicode.obj		\
-	.\$(OBJDIR)\nsVPSToUnicode.obj			\
-	.\$(OBJDIR)\nsVIQRToUnicode.obj			\
-	.\$(OBJDIR)\nsVNIToUnicode.obj			\
-	.\$(OBJDIR)\nsUserDefinedToUnicode.obj			\
-	.\$(OBJDIR)\nsUnicodeToUEscape.obj		\
-	.\$(OBJDIR)\nsUnicodeToAscii.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO88592.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO88593.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO88594.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO88595.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO88596.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO88596E.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO88596I.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO88597.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO88598.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO88598E.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO88598I.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO88599.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO885910.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO885913.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO885914.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO885915.obj		\
-	.\$(OBJDIR)\nsUnicodeToISO885916.obj		\
-	.\$(OBJDIR)\nsUnicodeToISOIR111.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP1250.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP1251.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP1253.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP1254.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP1255.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP1256.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP1257.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP1258.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP874.obj		\
-	.\$(OBJDIR)\nsUnicodeToCP866.obj		\
-	.\$(OBJDIR)\nsUnicodeToKOI8R.obj		\
-	.\$(OBJDIR)\nsUnicodeToKOI8U.obj		\
-	.\$(OBJDIR)\nsUnicodeToMacCE.obj		\
-	.\$(OBJDIR)\nsUnicodeToMacGreek.obj		\
-	.\$(OBJDIR)\nsUnicodeToMacTurkish.obj		\
-	.\$(OBJDIR)\nsUnicodeToUTF7.obj			\
-	.\$(OBJDIR)\nsUnicodeToMUTF7.obj		\
-	.\$(OBJDIR)\nsUnicodeToUCS2BE.obj			\
-	.\$(OBJDIR)\nsUnicodeToUCS2LE.obj			\
-	.\$(OBJDIR)\nsUnicodeToUCS4BE.obj			\
-	.\$(OBJDIR)\nsUnicodeToUCS4LE.obj			\
-	.\$(OBJDIR)\nsUnicodeToT61.obj			\
-	.\$(OBJDIR)\nsUnicodeToMacCroatian.obj		\
-	.\$(OBJDIR)\nsUnicodeToMacRomanian.obj		\
-	.\$(OBJDIR)\nsUnicodeToMacCyrillic.obj		\
-	.\$(OBJDIR)\nsUnicodeToMacUkrainian.obj		\
-	.\$(OBJDIR)\nsUnicodeToMacIcelandic.obj		\
-	.\$(OBJDIR)\nsUnicodeToMacArabic.obj		\
-	.\$(OBJDIR)\nsUnicodeToMacDevanagari.obj	\
-	.\$(OBJDIR)\nsUnicodeToMacGujarati.obj		\
-	.\$(OBJDIR)\nsUnicodeToMacGurmukhi.obj		\
-	.\$(OBJDIR)\nsUnicodeToMacHebrew.obj		\
-	.\$(OBJDIR)\nsUnicodeToMacFarsi.obj		\
-	.\$(OBJDIR)\nsUnicodeToGEOSTD8.obj		\
-	.\$(OBJDIR)\nsUnicodeToARMSCII8.obj		\
-	.\$(OBJDIR)\nsUnicodeToTCVN5712.obj		\
-	.\$(OBJDIR)\nsUnicodeToVISCII.obj		\
-	.\$(OBJDIR)\nsUnicodeToVPS.obj			\
-	.\$(OBJDIR)\nsUnicodeToVIQR.obj			\
-	.\$(OBJDIR)\nsUnicodeToVNI.obj			\
-	.\$(OBJDIR)\nsUnicodeToUserDefined.obj			\
-	.\$(OBJDIR)\nsUnicodeToSymbol.obj			\
-	.\$(OBJDIR)\nsUnicodeToZapfDingbat.obj			\
-	.\$(OBJDIR)\nsUCvLatinSupport.obj		\
-	.\$(OBJDIR)\nsUCvLatinModule.obj 			\
-	$(NULL)
-
-EXPORTS=nsUCvLatinCID.h			\
-	$(NULL)
-
-LLIBS=					\
- $(DIST)\lib\xpcom.lib		\
- $(LIBNSPR)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
--- a/intl/uconv/ucvmath/Makefile.in
+++ b/intl/uconv/ucvmath/Makefile.in
@ -69,7 +69,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_INTL
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/intl/uconv/ucvmath/makefile.win
+++ b/intl/uconv/ucvmath/makefile.win
@ -1,61 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla MathML Project.
-# 
-# The Initial Developer of the Original Code is The University Of 
-# Queensland.  Portions created by The University Of Queensland are
-# Copyright (C) 1999 The University Of Queensland.  All Rights Reserved.
-# 
-# Contributor(s): 
-#   Roger B. Sidje <rbs@maths.uq.edu.au>
-#
-
-DEPTH=..\..\..
-
-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
-
-MODULE=uconv
-LIBRARY_NAME=ucvmath
-MODULE_NAME=nsUCvMathModule
-REQUIRES         =	xpcom \
-                    string \
-                    $(NULL)
-
-CPP_OBJS=						\
-	.\$(OBJDIR)\nsUnicodeToTeXCMRttf.obj		\
-	.\$(OBJDIR)\nsUnicodeToTeXCMMIttf.obj		\
-	.\$(OBJDIR)\nsUnicodeToTeXCMSYttf.obj		\
-	.\$(OBJDIR)\nsUnicodeToTeXCMEXttf.obj		\
-	.\$(OBJDIR)\nsUnicodeToMathematica1.obj		\
-	.\$(OBJDIR)\nsUnicodeToMathematica2.obj		\
-	.\$(OBJDIR)\nsUnicodeToMathematica3.obj		\
-	.\$(OBJDIR)\nsUnicodeToMathematica4.obj		\
-	.\$(OBJDIR)\nsUnicodeToMathematica5.obj		\
-	.\$(OBJDIR)\nsUnicodeToMTExtra.obj		\
-	.\$(OBJDIR)\nsUCvMathSupport.obj		\
-	.\$(OBJDIR)\nsUCvMathModule.obj 		\
-	$(NULL)
-
-EXPORTS=nsUCvMathCID.h			\
-	$(NULL)
-
-LLIBS=					\
- $(DIST)\lib\xpcom.lib		\
- $(LIBNSPR)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
--- a/intl/uconv/ucvtw/Makefile.in
+++ b/intl/uconv/ucvtw/Makefile.in
@ -55,7 +55,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_INTL
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/intl/uconv/ucvtw/makefile.win
+++ b/intl/uconv/ucvtw/makefile.win
@ -1,58 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
-
-MODULE=uconv
-REQUIRES	= xpcom \
-		  string \
-		  $(NULL)
-LIBRARY_NAME=ucvtw
-MODULE_NAME=nsUCvTWModule
-
-CPP_OBJS=						\
-	.\$(OBJDIR)\nsBIG5ToUnicode.obj 		\
-	.\$(OBJDIR)\nsUnicodeToBIG5.obj			\
-	.\$(OBJDIR)\nsBIG5HKSCSToUnicode.obj 		\
-	.\$(OBJDIR)\nsUnicodeToBIG5HKSCS.obj			\
-	.\$(OBJDIR)\nsUnicodeToHKSCS.obj			\
-	.\$(OBJDIR)\nsCP950ToUnicode.obj 		\
-	.\$(OBJDIR)\nsUnicodeToCP950.obj			\
-	.\$(OBJDIR)\nsUnicodeToBIG5NoAscii.obj			\
-	.\$(OBJDIR)\nsUCvTWSupport.obj			\
-	.\$(OBJDIR)\nsUCvTwModule.obj 			\
-	$(NULL)
-
-EXPORTS=nsUCvTWCID.h			\
-	$(NULL)
-
-LLIBS=					\
- $(DIST)\lib\xpcom.lib		\
- $(LIBNSPR)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
--- a/intl/uconv/ucvtw2/Makefile.in
+++ b/intl/uconv/ucvtw2/Makefile.in
@ -56,7 +56,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_INTL
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/intl/uconv/ucvtw2/makefile.win
+++ b/intl/uconv/ucvtw2/makefile.win
@ -1,59 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
-
-MODULE=uconv
-REQUIRES	= xpcom \
-		  string \
-		  $(NULL)
-LIBRARY_NAME=ucvtw2
-MODULE_NAME=nsUCvTW2Module
-
-CPP_OBJS=						\
-	.\$(OBJDIR)\nsEUCTWToUnicode.obj 		\
-	.\$(OBJDIR)\nsUnicodeToEUCTW.obj		\
-	.\$(OBJDIR)\nsUnicodeToCNS11643p1.obj		\
-	.\$(OBJDIR)\nsUnicodeToCNS11643p2.obj		\
-	.\$(OBJDIR)\nsUnicodeToCNS11643p3.obj		\
-	.\$(OBJDIR)\nsUnicodeToCNS11643p4.obj		\
-	.\$(OBJDIR)\nsUnicodeToCNS11643p5.obj		\
-	.\$(OBJDIR)\nsUnicodeToCNS11643p6.obj		\
-	.\$(OBJDIR)\nsUnicodeToCNS11643p7.obj		\
-	.\$(OBJDIR)\nsUCvTW2Support.obj			\
-	.\$(OBJDIR)\nsUCvTw2Module.obj 			\
-	$(NULL)
-
-EXPORTS=nsUCvTW2CID.h			\
-	$(NULL)
-
-LLIBS=					\
- $(DIST)\lib\xpcom.lib		\
- $(LIBNSPR)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
--- a/profile/pref-migrator/public/makefile.win
+++ b/profile/pref-migrator/public/makefile.win
@ -1,35 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-MODULE=prefmigr
-
-DEFINES=-D_IMPL_NS_DOM 
-EXPORTS=nsPrefMigrationCIDs.h
-
-XPIDLSRCS =  .\nsIPrefMigration.idl			\
-		$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-
-
--- a/profile/pref-migrator/src/Makefile.in
+++ b/profile/pref-migrator/src/Makefile.in
@ -62,8 +62,6 @@ EXTRA_DSO_LDOPTS = \

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_DOM
-
 # XXX os/2's gcc crashes on nsPrefMigration.cpp ("virtual memory exhausted")
 ifeq ($(MOZ_OS2_TOOLS),EMX)
 CXXFLAGS	:= $(filter-out -g,$(CXXFLAGS))
--- a/profile/pref-migrator/src/makefile.win
+++ b/profile/pref-migrator/src/makefile.win
@ -1,67 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-
-DEPTH=..\..\..
-MODULE=nsprefm
-REQUIRES	= xpcom \
-		  string \
-		  pref \
-		  intl \
-		  docshell \
-		  dom \
-		  necko \
-		  widget \
-		  webBrowser_core \
-		  uconv \
-		  windowwatcher \
-		  prefmigr \
-		  $(NULL)
-
-include <$(DEPTH)/config/config.mak>
-
-
-LIBRARY_NAME=nsprefm
-MODULE_NAME=nsPrefMigrationModule
-
-EXPORTS=nsPrefMigration.h	 \
-	nsPrefMigrationFactory.h \
-	$(NULL)
-
-DEFINES=-D_IMPL_NS_DOM 
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-LLIBS =                      \
-    $(DIST)\lib\xpcom.lib    \
-    $(DIST)\lib\js3250.lib        \
-    $(LIBNSPR)               \
-    $(NULL)
-
-OBJS = \
-    .\$(OBJDIR)\nsPrefMigration.obj        \
-    .\$(OBJDIR)\nsPrefMigrationFactory.obj \
-    $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
--- a/xpcom/base/nsComObsolete.h
+++ b/xpcom/base/nsComObsolete.h
@ -37,12 +37,6 @@
 #define nsComObsolete_h__

 /* These _IMPL_NS_*  defines should move into their own directories.  */
-#ifdef _IMPL_NS_DOM
-#define NS_DOM NS_EXPORT
-#else
-#define NS_DOM NS_IMPORT
-#endif
-
 #ifdef _IMPL_NS_WIDGET
 #define NS_WIDGET NS_EXPORT
 #else
--- a/xpinstall/public/nsIDOMInstallTriggerGlobal.h
+++ b/xpinstall/public/nsIDOMInstallTriggerGlobal.h
@ -78,6 +78,6 @@ public:

 extern nsresult NS_InitInstallTriggerGlobalClass(nsIScriptContext *aContext, void **aPrototype);

-extern "C" NS_DOM nsresult NS_NewScriptInstallTriggerGlobal(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+extern "C" nsresult NS_NewScriptInstallTriggerGlobal(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);

 #endif // nsIDOMInstallTriggerGlobal_h__
--- a/xpinstall/public/nsIDOMInstallVersion.h
+++ b/xpinstall/public/nsIDOMInstallVersion.h
@ -121,6 +121,6 @@ public:

 extern nsresult NS_InitInstallVersionClass(nsIScriptContext *aContext, void **aPrototype);

-extern "C" NS_DOM nsresult NS_NewScriptInstallVersion(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+extern "C" nsresult NS_NewScriptInstallVersion(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);

 #endif // nsIDOMInstallVersion_h__
--- a/xpinstall/src/Makefile.in
+++ b/xpinstall/src/Makefile.in
@ -121,8 +121,6 @@ EXTRA_DSO_LDOPTS = \

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_DOM
-
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN -DZLIB_DLL
 endif
--- a/xpinstall/src/makefile.win
+++ b/xpinstall/src/makefile.win
@ -1,122 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-
-
-# Make this a true dynamic component even in static builds because
-# this component is shared by installer
-!undef MOZ_STATIC_COMPONENT_LIBS
-
-DEPTH=..\..
-MODULE		= xpinstall
-REQUIRES	= xpcom \
-		  string \
-		  jar \
-		  chrome \
-		  necko \
-		  intl \
-		  locale \
-		  mozreg \
-		  js \
-		  pref \
-		  widget \
-		  uriloader \
-		  xpconnect \
-		  docshell \
-		  dom \
-		  windowwatcher \
-		  zlib \
-		  content \
-		  plugin \
-		  $(NULL)
-
-include <$(DEPTH)/config/config.mak>
-
-LIBRARY_NAME	= xpinstal
-MODULE_NAME	= nsSoftwareUpdate
-
-DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN -DZLIB_DLL
-
-INCLUDES=-I..\cleanup
-
-LCFLAGS =          \
-	$(INCLUDES) \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-
-LLIBS =                                \
-        $(DIST)\lib\xpcom.lib          \
-        $(DIST)\lib\js3250.lib         \
-        $(DIST)\lib\zlib.lib           \
-        $(LIBNSPR)                     \
-        $(DIST)\lib\mozreg.lib         \
-        $(NULL)
-
-
-OBJS =                                          \
-       .\$(OBJDIR)\nsInstall.obj                \
-       .\$(OBJDIR)\nsInstallTrigger.obj         \
-       .\$(OBJDIR)\nsInstallVersion.obj         \
-       .\$(OBJDIR)\nsInstallFolder.obj          \
-       .\$(OBJDIR)\nsJSInstall.obj              \
-       .\$(OBJDIR)\nsJSFile.obj                 \
-       .\$(OBJDIR)\nsJSInstallTriggerGlobal.obj \
-       .\$(OBJDIR)\nsJSInstallVersion.obj       \
-       .\$(OBJDIR)\nsSoftwareUpdate.obj         \
-       .\$(OBJDIR)\nsSoftwareUpdateRun.obj      \
-       .\$(OBJDIR)\nsInstallFile.obj            \
-       .\$(OBJDIR)\nsInstallExecute.obj         \
-       .\$(OBJDIR)\nsInstallPatch.obj           \
-       .\$(OBJDIR)\nsInstallUninstall.obj       \
-       .\$(OBJDIR)\nsInstallResources.obj       \
-       .\$(OBJDIR)\nsRegisterItem.obj           \
-       .\$(OBJDIR)\nsTopProgressNotifier.obj    \
-       .\$(OBJDIR)\nsLoggingProgressNotifier.obj\
-       .\$(OBJDIR)\ScheduledTasks.obj           \
-       .\$(OBJDIR)\nsWinReg.obj                 \
-       .\$(OBJDIR)\nsJSWinReg.obj               \
-       .\$(OBJDIR)\nsWinRegItem.obj             \
-       .\$(OBJDIR)\nsWinRegValue.obj            \
-       .\$(OBJDIR)\nsWinProfile.obj             \
-       .\$(OBJDIR)\nsJSWinProfile.obj           \
-       .\$(OBJDIR)\nsWinProfileItem.obj         \
-       .\$(OBJDIR)\nsXPIProxy.obj               \
-       .\$(OBJDIR)\nsXPITriggerInfo.obj         \
-       .\$(OBJDIR)\nsXPInstallManager.obj       \
-       .\$(OBJDIR)\nsInstallFileOpItem.obj      \
-       .\$(OBJDIR)\nsWinShortcut.obj            \
-       .\$(OBJDIR)\nsJSFileSpecObj.obj          \
-       .\$(OBJDIR)\nsInstallLogComment.obj      \
-#     .\$(OBJDIR)\nsUpdateNotification.obj     \
-       .\$(OBJDIR)\nsInstallBitwise.obj         \
-       $(NULL)
-
-WIN_LIBS=                                       \
-       ole32.lib                                \
-       version.lib                              \
-       $(NULL)
-
-include <$(DEPTH)\config\rules.mak>