From 660db546ca10b2235f52f53cf637228bc1af0e27 Mon Sep 17 00:00:00 2001 From: "warren%netscape.com" Date: Mon, 24 May 1999 09:03:23 +0000 Subject: [PATCH] Moving changes from XPCOM20_BRANCH forward. git-svn-id: svn://10.0.0.236/trunk@32510 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/base/src/nsNetService.cpp | 1 - mozilla/netwerk/base/tests/makefile.win | 3 +-- mozilla/netwerk/base/tests/urltest.cpp | 1 - mozilla/netwerk/build/makefile.win | 3 +-- mozilla/netwerk/protocol/ftp/src/makefile.win | 3 +-- mozilla/netwerk/protocol/http/src/makefile.win | 4 +--- mozilla/netwerk/protocols/file/src/makefile.win | 3 +-- mozilla/netwerk/protocols/http/src/makefile.win | 3 +-- mozilla/netwerk/test/Makefile.in | 1 - mozilla/netwerk/test/TestSocketIO.cpp | 1 - mozilla/netwerk/test/TestSocketInput.cpp | 1 - mozilla/netwerk/test/makefile.win | 3 +-- mozilla/netwerk/test/nettest.cpp | 1 - 13 files changed, 7 insertions(+), 21 deletions(-) diff --git a/mozilla/netwerk/base/src/nsNetService.cpp b/mozilla/netwerk/base/src/nsNetService.cpp index ae14e250b87..cf3a4324761 100644 --- a/mozilla/netwerk/base/src/nsNetService.cpp +++ b/mozilla/netwerk/base/src/nsNetService.cpp @@ -22,7 +22,6 @@ #include "nsStandardUrl.h" #include "nscore.h" #include "nsString2.h" -#include "nsXPComCIID.h" #include "nsIServiceManager.h" #include "nsIEventQueueService.h" #include "nsIFileTransportService.h" diff --git a/mozilla/netwerk/base/tests/makefile.win b/mozilla/netwerk/base/tests/makefile.win index 6688dfde16c..8dc91ec4e1f 100644 --- a/mozilla/netwerk/base/tests/makefile.win +++ b/mozilla/netwerk/base/tests/makefile.win @@ -35,10 +35,9 @@ PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE LCFLAGS=-DNETSCAPE LLIBS=$(LLIBS) \ $(LIBNSPR) \ - $(DIST)\lib\xpcom32.lib \ + $(DIST)\lib\xpcom.lib \ $(DIST)\lib\nunet.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\plc3.lib LINCS=$(LINCS) -I. \ diff --git a/mozilla/netwerk/base/tests/urltest.cpp b/mozilla/netwerk/base/tests/urltest.cpp index e61ab61b89e..cdd0b39c18b 100644 --- a/mozilla/netwerk/base/tests/urltest.cpp +++ b/mozilla/netwerk/base/tests/urltest.cpp @@ -38,7 +38,6 @@ #include "nsRepository.h" #include "nsIServiceManager.h" #include "nsIEventQueueService.h" -#include "nsXPComCIID.h" #include "nsString.h" #include "nsIURL.h" diff --git a/mozilla/netwerk/build/makefile.win b/mozilla/netwerk/build/makefile.win index 77c3ce23a50..8f851efd466 100644 --- a/mozilla/netwerk/build/makefile.win +++ b/mozilla/netwerk/build/makefile.win @@ -28,8 +28,7 @@ CPP_OBJS= \ LLIBS= \ $(DIST)\lib\netwerkbase_s.lib \ - $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\raptorbase.lib \ + $(DIST)\lib\xpcom.lib \ $(DIST)\lib\plc3.lib \ $(LIBNSPR) diff --git a/mozilla/netwerk/protocol/ftp/src/makefile.win b/mozilla/netwerk/protocol/ftp/src/makefile.win index badbe76b341..782c65dc290 100644 --- a/mozilla/netwerk/protocol/ftp/src/makefile.win +++ b/mozilla/netwerk/protocol/ftp/src/makefile.win @@ -33,8 +33,7 @@ CPP_OBJS = \ LLIBS= \ $(DIST)\lib\netwerk.lib \ - $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\raptorbase.lib \ + $(DIST)\lib\xpcom.lib \ $(DIST)\lib\plc3.lib \ $(LIBNSPR) diff --git a/mozilla/netwerk/protocol/http/src/makefile.win b/mozilla/netwerk/protocol/http/src/makefile.win index 75ff0680d84..4ede57df050 100644 --- a/mozilla/netwerk/protocol/http/src/makefile.win +++ b/mozilla/netwerk/protocol/http/src/makefile.win @@ -36,8 +36,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll LLIBS= $(LLIBS) \ $(LIBNSPR) \ $(DIST)\lib\plc3.lib \ - $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\raptorbase.lib \ + $(DIST)\lib\xpcom.lib \ $(NULL) MISCDEP=$(LLIBS) @@ -63,7 +62,6 @@ REQUIRES= netwerk LINCS= \ -I..\public \ - -I$(PUBLIC)\raptor \ -I$(PUBLIC)\netwerk \ -I$(PUBLIC)\xpcom \ $(NULL) diff --git a/mozilla/netwerk/protocols/file/src/makefile.win b/mozilla/netwerk/protocols/file/src/makefile.win index 8317bef894f..16311719250 100644 --- a/mozilla/netwerk/protocols/file/src/makefile.win +++ b/mozilla/netwerk/protocols/file/src/makefile.win @@ -33,8 +33,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll LLIBS= $(LLIBS) \ $(LIBNSPR) \ $(DIST)\lib\plc3.lib \ - $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\raptorbase.lib \ + $(DIST)\lib\xpcom.lib \ $(NULL) MISCDEP=$(LLIBS) diff --git a/mozilla/netwerk/protocols/http/src/makefile.win b/mozilla/netwerk/protocols/http/src/makefile.win index 75ff0680d84..e2149b8aaa3 100644 --- a/mozilla/netwerk/protocols/http/src/makefile.win +++ b/mozilla/netwerk/protocols/http/src/makefile.win @@ -36,8 +36,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll LLIBS= $(LLIBS) \ $(LIBNSPR) \ $(DIST)\lib\plc3.lib \ - $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\raptorbase.lib \ + $(DIST)\lib\xpcom.lib \ $(NULL) MISCDEP=$(LLIBS) diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in index 91d96719be5..b5c0381987c 100644 --- a/mozilla/netwerk/test/Makefile.in +++ b/mozilla/netwerk/test/Makefile.in @@ -33,7 +33,6 @@ CPPSRCS = \ BASE_LIBS = \ -lreg \ -lxpcom \ - -lraptorbase \ -lnetwerk \ $(NULL) diff --git a/mozilla/netwerk/test/TestSocketIO.cpp b/mozilla/netwerk/test/TestSocketIO.cpp index c714616544b..eb923260002 100644 --- a/mozilla/netwerk/test/TestSocketIO.cpp +++ b/mozilla/netwerk/test/TestSocketIO.cpp @@ -23,7 +23,6 @@ #include "nspr.h" #include "nscore.h" -#include "nsXPComCIID.h" #include "nsISocketTransportService.h" #include "nsIEventQueueService.h" #include "nsIServiceManager.h" diff --git a/mozilla/netwerk/test/TestSocketInput.cpp b/mozilla/netwerk/test/TestSocketInput.cpp index afdd93959ca..2508b457fe3 100644 --- a/mozilla/netwerk/test/TestSocketInput.cpp +++ b/mozilla/netwerk/test/TestSocketInput.cpp @@ -22,7 +22,6 @@ #endif #include "nscore.h" -#include "nsXPComCIID.h" #include "nsISocketTransportService.h" #include "nsIEventQueueService.h" #include "nsIServiceManager.h" diff --git a/mozilla/netwerk/test/makefile.win b/mozilla/netwerk/test/makefile.win index 9b40fc24dab..b433d8c72fa 100644 --- a/mozilla/netwerk/test/makefile.win +++ b/mozilla/netwerk/test/makefile.win @@ -39,8 +39,7 @@ LINCS = \ $(NULL) LLIBS= \ - $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\raptorbase.lib \ + $(DIST)\lib\xpcom.lib \ $(LIBNSPR) \ $(DIST)\lib\plc3.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) diff --git a/mozilla/netwerk/test/nettest.cpp b/mozilla/netwerk/test/nettest.cpp index f8148e8c629..81fb58dd225 100644 --- a/mozilla/netwerk/test/nettest.cpp +++ b/mozilla/netwerk/test/nettest.cpp @@ -34,7 +34,6 @@ #include "nsIComponentManager.h" #include "nsIServiceManager.h" #include "nsIEventQueueService.h" -#include "nsXPComCIID.h" #include "nsString2.h"