Remove obsolete _IMPL_NS_NET and NS_NET defines (bug 159887). r=cls, sr=bzbarsky, a=asa.

git-svn-id: svn://10.0.0.236/trunk@126038 18797224-902f-48f8-a5cc-f745e15eee43
2002-07-30 02:25:08 +00:00
parent 6659aafe5f
commit 157f6e484f
45 changed files with 19 additions and 69 deletions
--- a/mozilla/config/config.mak
+++ b/mozilla/config/config.mak
@@ -214,7 +214,6 @@ 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_NET
 CFLAGS=$(CFLAGS) -D_IMPL_NS_PICS
 CFLAGS=$(CFLAGS) -D_IMPL_NS_PLUGIN
 CFLAGS=$(CFLAGS) -D_IMPL_NS_RDF
--- a/mozilla/extensions/datetime/Makefile.in
+++ b/mozilla/extensions/datetime/Makefile.in
@@ -44,7 +44,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/extensions/finger/Makefile.in
+++ b/mozilla/extensions/finger/Makefile.in
@@ -44,7 +44,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/base/public/netCore.h
+++ b/mozilla/netwerk/base/public/netCore.h
@@ -98,21 +98,6 @@
 #define NS_ERROR_REDIRECT_LOOP \
    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 31)

-#undef NS_NET
-#ifdef _IMPL_NS_NET
-#if defined(XP_PC) && !defined(XP_OS2)
-#define NS_NET _declspec(dllexport)
-#else  /* !XP_PC */
-#define NS_NET
-#endif /* !XP_PC */
-#else  /* !_IMPL_NS_NET */
-#if defined(XP_PC) && !defined(XP_OS2)
-#define NS_NET _declspec(dllimport)
-#else  /* !XP_PC */
-#define NS_NET
-#endif /* !XP_PC */
-#endif /* !_IMPL_NS_NET */
-
 // Where most necko status messages come from:
 #define NECKO_MSGS_URL  "chrome://necko/locale/necko.properties"

--- a/mozilla/netwerk/base/src/Makefile.in
+++ b/mozilla/netwerk/base/src/Makefile.in
@@ -94,8 +94,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES += -D_IMPL_NS_NET
-
 # For fruncate
 ifeq ($(OS_ARCH),Linux)
 DEFINES += -D_BSD_SOURCE
--- a/mozilla/netwerk/base/src/makefile.win
+++ b/mozilla/netwerk/base/src/makefile.win
@@ -31,7 +31,7 @@ REQUIRES	= xpcom \
 		  $(NULL)
 include <$(DEPTH)/config/config.mak>

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 LIBRARY_NAME=neckobase_s

--- a/mozilla/netwerk/build/Makefile.in
+++ b/mozilla/netwerk/build/Makefile.in
@@ -98,7 +98,6 @@ EXTRA_DSO_LDOPTS = \

 include $(topsrcdir)/config/rules.mk

-DEFINES                += -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES                += -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/build/makefile.win
+++ b/mozilla/netwerk/build/makefile.win
@@ -40,7 +40,7 @@ REQUIRES	= xpcom \

 include <$(DEPTH)/config/config.mak>

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 EXPORTS =          \
        nsNetCID.h \
--- a/mozilla/netwerk/build2/Makefile.in
+++ b/mozilla/netwerk/build2/Makefile.in
@@ -61,7 +61,6 @@ EXTRA_DSO_LDOPTS = \

 include $(topsrcdir)/config/rules.mk

-DEFINES                += -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES                += -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/build2/makefile.win
+++ b/mozilla/netwerk/build2/makefile.win
@@ -30,7 +30,7 @@ REQUIRES	= xpcom \
 		  necko \
 		  $(NULL)

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS=                            \
        .\$(OBJDIR)\nsNetModule2.obj \
--- a/mozilla/netwerk/cache/src/Makefile.in
+++ b/mozilla/netwerk/cache/src/Makefile.in
@@ -70,7 +70,6 @@ EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/cache/src/makefile.win
+++ b/mozilla/netwerk/cache/src/makefile.win
@@ -32,7 +32,7 @@ REQUIRES	= xpcom \

 include <$(DEPTH)/config/config.mak>

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 EXPORTS = \
 		nsCacheService.h \
--- a/mozilla/netwerk/dns/src/Makefile.in
+++ b/mozilla/netwerk/dns/src/Makefile.in
@@ -46,7 +46,6 @@ ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_BSD_SOURCE
 endif

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/dns/src/makefile.win
+++ b/mozilla/netwerk/dns/src/makefile.win
@@ -25,7 +25,7 @@ REQUIRES	= xpcom \
 		  string \
 		  pref \
 		  $(NULL)
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 LIBRARY_NAME=neckodns_s

--- a/mozilla/netwerk/macbuild/NetwerkSharedPrefix.h
+++ b/mozilla/netwerk/macbuild/NetwerkSharedPrefix.h
@@ -20,7 +20,4 @@
 * Contributor(s): 
 */

-/* Defining the following causes NS_NET to be defined as NS_EXPORT. */
-#define _IMPL_NS_NET
-
 #include "MacSharedPrefix.h"
--- a/mozilla/netwerk/macbuild/NetwerkSharedPrefix_debug.h
+++ b/mozilla/netwerk/macbuild/NetwerkSharedPrefix_debug.h
@@ -20,8 +20,5 @@
 * Contributor(s): 
 */

-/* Defining the following causes NS_NET to be defined as NS_EXPORT. */
-#define _IMPL_NS_NET
-
 #include "MacSharedPrefix_debug.h"

--- a/mozilla/netwerk/mime/src/Makefile.in
+++ b/mozilla/netwerk/mime/src/Makefile.in
@@ -46,7 +46,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/mime/src/makefile.win
+++ b/mozilla/netwerk/mime/src/makefile.win
@@ -34,7 +34,7 @@ LLIBS= $(LLIBS) \
        $(LIBNSPR) \
        $(NULL)

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS =                                  \
        .\$(OBJDIR)\nsMIMEInfoImpl.obj      \
--- a/mozilla/netwerk/protocol/about/src/Makefile.in
+++ b/mozilla/netwerk/protocol/about/src/Makefile.in
@@ -51,7 +51,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/protocol/about/src/makefile.win
+++ b/mozilla/netwerk/protocol/about/src/makefile.win
@@ -32,7 +32,7 @@ include <$(DEPTH)/config/config.mak>

 LIBRARY_NAME=nkabout_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS=                                      \
 	.\$(OBJDIR)\nsAboutProtocolHandler.obj \
--- a/mozilla/netwerk/protocol/data/src/Makefile.in
+++ b/mozilla/netwerk/protocol/data/src/Makefile.in
@@ -43,7 +43,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/protocol/data/src/makefile.win
+++ b/mozilla/netwerk/protocol/data/src/makefile.win
@@ -26,7 +26,7 @@ REQUIRES	= xpcom \

 LIBRARY_NAME=nkdata_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS =                                 \
        .\$(OBJDIR)\nsDataHandler.obj      \
--- a/mozilla/netwerk/protocol/datetime/src/Makefile.in
+++ b/mozilla/netwerk/protocol/datetime/src/Makefile.in
@@ -44,7 +44,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/protocol/datetime/src/makefile.win
+++ b/mozilla/netwerk/protocol/datetime/src/makefile.win
@@ -27,7 +27,7 @@ REQUIRES= xpcom \

 LIBRARY_NAME=nkdatetm_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS =                                 \
        .\$(OBJDIR)\nsDateTimeHandler.obj      \
--- a/mozilla/netwerk/protocol/file/src/Makefile.in
+++ b/mozilla/netwerk/protocol/file/src/Makefile.in
@@ -46,7 +46,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/protocol/file/src/makefile.win
+++ b/mozilla/netwerk/protocol/file/src/makefile.win
@@ -31,7 +31,7 @@ include <$(DEPTH)/config/config.mak>

 LIBRARY_NAME=nkfile_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS=                                      \
 	.\$(OBJDIR)\nsFileChannel.obj          \
--- a/mozilla/netwerk/protocol/finger/src/Makefile.in
+++ b/mozilla/netwerk/protocol/finger/src/Makefile.in
@@ -44,7 +44,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/protocol/finger/src/makefile.win
+++ b/mozilla/netwerk/protocol/finger/src/makefile.win
@@ -28,7 +28,7 @@ REQUIRES= xpcom \

 LIBRARY_NAME=nkfinger_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS =                                 \
        .\$(OBJDIR)\nsFingerHandler.obj      \
--- a/mozilla/netwerk/protocol/ftp/src/Makefile.in
+++ b/mozilla/netwerk/protocol/ftp/src/Makefile.in
@@ -58,7 +58,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 ifndef MOZ_DEBUG
--- a/mozilla/netwerk/protocol/ftp/src/makefile.win
+++ b/mozilla/netwerk/protocol/ftp/src/makefile.win
@@ -32,7 +32,7 @@ DEPTH = ..\..\..\..

 LIBRARY_NAME=nkftp_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 !ifndef MOZ_DEBUG
 !ifndef NO_LOGGING
--- a/mozilla/netwerk/protocol/gopher/src/Makefile.in
+++ b/mozilla/netwerk/protocol/gopher/src/Makefile.in
@@ -45,7 +45,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/protocol/gopher/src/makefile.win
+++ b/mozilla/netwerk/protocol/gopher/src/makefile.win
@@ -29,7 +29,7 @@ REQUIRES	= xpcom \

 LIBRARY_NAME=nkgopher_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS =                                 \
        .\$(OBJDIR)\nsGopherHandler.obj      \
--- a/mozilla/netwerk/protocol/http/src/Makefile.in
+++ b/mozilla/netwerk/protocol/http/src/Makefile.in
@@ -64,7 +64,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/protocol/http/src/makefile.win
+++ b/mozilla/netwerk/protocol/http/src/makefile.win
@@ -37,7 +37,7 @@ include <$(DEPTH)/config/config.mak>

 LIBRARY_NAME=nkhttp_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS=		                         \
 	.\$(OBJDIR)\nsHttp.obj		         \
--- a/mozilla/netwerk/protocol/jar/src/Makefile.in
+++ b/mozilla/netwerk/protocol/jar/src/Makefile.in
@@ -51,7 +51,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/protocol/jar/src/makefile.win
+++ b/mozilla/netwerk/protocol/jar/src/makefile.win
@@ -34,7 +34,7 @@ REQUIRES	= xpcom \

 LIBRARY_NAME=nkjar_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS=                                    \
 	.\$(OBJDIR)\nsJARURI.obj             \
--- a/mozilla/netwerk/protocol/res/src/Makefile.in
+++ b/mozilla/netwerk/protocol/res/src/Makefile.in
@@ -49,7 +49,6 @@ LOCAL_INCLUDES =                        \

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/protocol/res/src/makefile.win
+++ b/mozilla/netwerk/protocol/res/src/makefile.win
@@ -28,7 +28,7 @@ REQUIRES	= xpcom \

 LIBRARY_NAME=nkres_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS=                                    \
 	.\$(OBJDIR)\nsResProtocolHandler.obj \
--- a/mozilla/netwerk/protocol/viewsource/src/Makefile.in
+++ b/mozilla/netwerk/protocol/viewsource/src/Makefile.in
@@ -45,7 +45,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/protocol/viewsource/src/makefile.win
+++ b/mozilla/netwerk/protocol/viewsource/src/makefile.win
@@ -31,7 +31,7 @@ REQUIRES	= xpcom \

 LIBRARY_NAME=nkviewsource_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS =                                 \
        .\$(OBJDIR)\nsViewSourceHandler.obj      \
--- a/mozilla/netwerk/streamconv/converters/Makefile.in
+++ b/mozilla/netwerk/streamconv/converters/Makefile.in
@@ -67,7 +67,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN -DZLIB_DLL
 endif
--- a/mozilla/netwerk/streamconv/converters/makefile.win
+++ b/mozilla/netwerk/streamconv/converters/makefile.win
@@ -37,7 +37,7 @@ include <$(DEPTH)/config/config.mak>

 LIBRARY_NAME=nkcnvts_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET -DZLIB_DLL
+LCFLAGS = -DWIN32_LEAN_AND_MEAN -DZLIB_DLL
 # Add this for performance TXT-HTML performance #'s: -DMOZ_PERF_METRICS

 EXPORTS =                 \
--- a/mozilla/netwerk/streamconv/src/Makefile.in
+++ b/mozilla/netwerk/streamconv/src/Makefile.in
@@ -42,7 +42,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
--- a/mozilla/netwerk/streamconv/src/makefile.win
+++ b/mozilla/netwerk/streamconv/src/makefile.win
@@ -27,7 +27,7 @@ include <$(DEPTH)/config/config.mak>

 LIBRARY_NAME=nkconv_s

-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN

 CPP_OBJS =                                       \
        .\$(OBJDIR)\nsStreamConverterService.obj \
--- a/mozilla/xpcom/base/nsComObsolete.h
+++ b/mozilla/xpcom/base/nsComObsolete.h
@@ -43,12 +43,6 @@
 #define NS_BASE NS_IMPORT
 #endif

-#ifdef _IMPL_NS_NET
-#define NS_NET NS_EXPORT
-#else
-#define NS_NET NS_IMPORT
-#endif
-
 #ifdef _IMPL_NS_DOM
 #define NS_DOM NS_EXPORT
 #else