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 · 7dafb891cc
--- 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
@ -22,7 +22,6 @@
 DEPTH=..\..\..


-DEFINES=-D_IMPL_NS_DOM 
 EXPORTS=nsPIDOMWindow.h nsPIWindowRoot.h nsIFocusController.h

 MODULE=dom 
--- a/dom/public/coreEvents/makefile.win
+++ b/dom/public/coreEvents/makefile.win
@ -22,8 +22,6 @@
 DEPTH=..\..\..


-DEFINES=-D_IMPL_NS_DOM
-
 EXPORTS =				\
 	nsIDOMEventCapturer.h		\
 	nsIDOMEventReceiver.h		\
--- 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
@ -24,7 +24,7 @@ DEPTH=..\..\..

 LIBRARY_NAME=jsdombase_s 

-DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
+DEFINES=-DWIN32_LEAN_AND_MEAN

 LINCS= -I..\build
 REQUIRES	= xpcom \
--- 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
@ -40,7 +40,6 @@ REQUIRES	= xpcom \
 		  $(NULL)
 include <$(DEPTH)/config/config.mak>

-DEFINES=-D_IMPL_NS_DOM
 LINCS=-I..\base

 CPP_OBJS = .\$(OBJDIR)\nsDOMFactory.obj			\
--- 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
@ -34,7 +34,7 @@ REQUIRES	= xpcom \
 		  gfx \
 		  $(NULL)

-DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
+DEFINES=-DWIN32_LEAN_AND_MEAN

 LINCS= -I..\base

--- a/dom/src/jsurl/macbuild/JSUrl.xml
+++ b/dom/src/jsurl/macbuild/JSUrl.xml
@ -469,7 +469,7 @@
                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>1</VALUE></SETTING>
                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>JSUrlPrefix_debug.h</VALUE></SETTING>
+                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>MacSharedPrefix_debug.h</VALUE></SETTING>
                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
@ -1426,7 +1426,7 @@
                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>1</VALUE></SETTING>
                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>JSUrlPrefix.h</VALUE></SETTING>
+                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>MacSharedPrefix.h</VALUE></SETTING>
                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
--- a/dom/src/jsurl/macbuild/JSUrlPrefix.h
+++ b/dom/src/jsurl/macbuild/JSUrlPrefix.h
@ -1,26 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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): 
- */
-
-/* Defining the following causes NS_DOM to be defined as NS_EXPORT. */
-#define _IMPL_NS_DOM
-
-#include "MacSharedPrefix.h"
--- a/dom/src/jsurl/macbuild/JSUrlPrefix_debug.h
+++ b/dom/src/jsurl/macbuild/JSUrlPrefix_debug.h
@ -1,26 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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): 
- */
-
-/* Defining the following causes NS_DOM to be defined as NS_EXPORT. */
-#define _IMPL_NS_DOM
-
-#include "MacSharedPrefix_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
@ -24,7 +24,7 @@

 DEPTH		= ..\..\..

-DEFINES		= -D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
+DEFINES		= -DWIN32_LEAN_AND_MEAN

 MODULE		= locale
 REQUIRES	= xpcom \
--- 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
@ -30,7 +30,7 @@ REQUIRES	= xpcom \
 		  $(NULL)
 include <$(DEPTH)/config/config.mak>

-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
+DEFINES=-DWIN32_LEAN_AND_MEAN

 LIBRARY_NAME=uconv
 MODULE_NAME=nsUConvModule
--- 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
@ -21,7 +21,7 @@

 DEPTH=..\..\..

-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
+DEFINES=-DWIN32_LEAN_AND_MEAN

 MODULE=uconv
 REQUIRES	= xpcom \
--- 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
@ -33,7 +33,7 @@

 DEPTH=..\..\..

-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
+DEFINES=-DWIN32_LEAN_AND_MEAN

 MODULE=uconv
 REQUIRES	= xpcom \
--- a/intl/uconv/ucvja/makefile.win
+++ b/intl/uconv/ucvja/makefile.win
@ -21,7 +21,7 @@

 DEPTH=..\..\..

-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
+DEFINES=-DWIN32_LEAN_AND_MEAN

 MODULE=uconv
 REQUIRES	= xpcom \
--- 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
@ -21,7 +21,7 @@

 DEPTH=..\..\..

-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
+DEFINES=-DWIN32_LEAN_AND_MEAN

 MODULE=uconv
 REQUIRES	= xpcom \
--- 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
@ -21,7 +21,7 @@

 DEPTH=..\..\..

-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
+DEFINES=-DWIN32_LEAN_AND_MEAN

 MODULE=uconv
 LIBRARY_NAME=ucvlatin
--- 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
@ -22,7 +22,7 @@

 DEPTH=..\..\..

-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
+DEFINES=-DWIN32_LEAN_AND_MEAN

 MODULE=uconv
 LIBRARY_NAME=ucvmath
--- 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
@ -21,7 +21,7 @@

 DEPTH=..\..\..

-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
+DEFINES=-DWIN32_LEAN_AND_MEAN

 MODULE=uconv
 REQUIRES	= xpcom \
--- 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
@ -21,7 +21,7 @@

 DEPTH=..\..\..

-DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
+DEFINES=-DWIN32_LEAN_AND_MEAN

 MODULE=uconv
 REQUIRES	= xpcom \
--- a/profile/pref-migrator/public/makefile.win
+++ b/profile/pref-migrator/public/makefile.win
@ -23,7 +23,6 @@ DEPTH=..\..\..

 MODULE=prefmigr

-DEFINES=-D_IMPL_NS_DOM 
 EXPORTS=nsPrefMigrationCIDs.h

 XPIDLSRCS =  .\nsIPrefMigration.idl			\
--- 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
@ -46,8 +46,6 @@ EXPORTS=nsPrefMigration.h	 \
 	nsPrefMigrationFactory.h \
 	$(NULL)

-DEFINES=-D_IMPL_NS_DOM 
-
 LCFLAGS = \
        $(LCFLAGS) \
        $(DEFINES) \
--- 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
@ -56,7 +56,7 @@ include <$(DEPTH)/config/config.mak>
 LIBRARY_NAME	= xpinstal
 MODULE_NAME	= nsSoftwareUpdate

-DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN -DZLIB_DLL
+DEFINES=-DWIN32_LEAN_AND_MEAN -DZLIB_DLL

 INCLUDES=-I..\cleanup