From 9c1b7ede8097b962a247d9add69ee3aa19f949cc Mon Sep 17 00:00:00 2001
From: "warren%netscape.com" <warren%netscape.com>
Date: Sun, 26 Sep 1999 07:26:21 +0000
Subject: [PATCH] Took out unused page manager.

---
 xpcom/build/nsXPComInit.cpp | 6 ++++++
 xpcom/ds/Makefile.in        | 2 --
 xpcom/ds/makefile.win       | 2 --
 xpcom/io/nsPipe2.cpp        | 6 +++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp
index 6692e14036b..6395123ac1f 100644
--- a/xpcom/build/nsXPComInit.cpp
+++ b/xpcom/build/nsXPComInit.cpp
@@ -29,7 +29,9 @@
 #include "nsBuffer.h"
 #endif
 #include "nsByteBuffer.h"
+#ifdef PAGE_MANAGER
 #include "nsPageMgr.h"
+#endif
 #include "nsSupportsArray.h"
 #include "nsSupportsPrimitives.h"
 #include "nsUnicharBuffer.h"
@@ -54,7 +56,9 @@ static NS_DEFINE_CID(kArenaCID, NS_ARENA_CID);
 static NS_DEFINE_CID(kBufferCID, NS_BUFFER_CID);
 #endif
 static NS_DEFINE_CID(kByteBufferCID, NS_BYTEBUFFER_CID);
+#ifdef PAGE_MANAGER
 static NS_DEFINE_CID(kPageManagerCID, NS_PAGEMANAGER_CID);
+#endif
 static NS_DEFINE_CID(kPropertiesCID, NS_PROPERTIES_CID);
 static NS_DEFINE_CID(kSupportsArrayCID, NS_SUPPORTSARRAY_CID);
 static NS_DEFINE_CID(kUnicharBufferCID, NS_UNICHARBUFFER_CID);
@@ -251,11 +255,13 @@ nsresult NS_COM NS_InitXPCOM(nsIServiceManager* *result,
                                 nsDirectoryIteratorImpl::Create);
     if (NS_FAILED(rv)) return rv;
 
+#ifdef PAGE_MANAGER
     rv = RegisterGenericFactory(compMgr, kPageManagerCID,
                                 NS_PAGEMANAGER_CLASSNAME,
                                 NS_PAGEMANAGER_PROGID,
                                 nsPageMgr::Create);
     if (NS_FAILED(rv)) return rv;
+#endif
 
     rv = RegisterGenericFactory(compMgr, kPropertiesCID,
                                 NS_PROPERTIES_CLASSNAME,
diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in
index db9ae54c62a..0767d60b8a6 100644
--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -43,7 +43,6 @@ CPPSRCS		= \
 		nsObserver.cpp \
 		nsObserverList.cpp \
 		nsObserverService.cpp \
-		nsPageMgr.cpp \
 		nsProperties.cpp \
 		nsQuickSort.cpp \
 		nsSizeOfHandler.cpp \
@@ -72,7 +71,6 @@ EXPORTS		= \
 		nsIArena.h \
 		nsIByteBuffer.h \
 		nsIObserverList.h \
-		nsIPageManager.h \
 		nsIProperties.h \
 		nsISimpleEnumerator.h \
 		nsISizeOfHandler.h \
diff --git a/xpcom/ds/makefile.win b/xpcom/ds/makefile.win
index a152b60bb05..8edd1bbab81 100644
--- a/xpcom/ds/makefile.win
+++ b/xpcom/ds/makefile.win
@@ -35,7 +35,6 @@ EXPORTS =                          \
         nsIArena.h                 \
         nsIByteBuffer.h            \
         nsIObserverList.h          \
-        nsIPageManager.h           \
         nsIProperties.h            \
         nsISimpleEnumerator.h      \
         nsISizeOfHandler.h         \
@@ -96,7 +95,6 @@ CPP_OBJS =                                        \
         .\$(OBJDIR)\nsObserver.obj                \
         .\$(OBJDIR)\nsObserverList.obj            \
         .\$(OBJDIR)\nsObserverService.obj         \
-        .\$(OBJDIR)\nsPageMgr.obj                 \
         .\$(OBJDIR)\nsProperties.obj              \
         .\$(OBJDIR)\nsQuickSort.obj               \
         .\$(OBJDIR)\nsSizeOfHandler.obj           \
diff --git a/xpcom/io/nsPipe2.cpp b/xpcom/io/nsPipe2.cpp
index 26b0afa9cd5..93e1210e702 100644
--- a/xpcom/io/nsPipe2.cpp
+++ b/xpcom/io/nsPipe2.cpp
@@ -22,7 +22,9 @@
 #include "nsSegmentedBuffer.h"
 #include "nsAutoLock.h"
 #include "nsIServiceManager.h"
+#ifdef PAGE_MANAGER
 #include "nsIPageManager.h"
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -760,7 +762,9 @@ nsPipe::nsPipeOutputStream::SetNonBlocking(PRBool aNonBlocking)
 
 ////////////////////////////////////////////////////////////////////////////////
 
+#ifdef PAGE_MANAGER
 static NS_DEFINE_CID(kPageManagerCID, NS_PAGEMANAGER_CID);
+#endif
 static NS_DEFINE_CID(kAllocatorCID, NS_ALLOCATOR_CID);
 
 NS_COM nsresult
@@ -772,7 +776,7 @@ NS_NewPipe(nsIBufferInputStream* *inStrResult,
 {
     nsresult rv;
     const nsCID* cid = &kAllocatorCID;
-#if 0
+#ifdef PAGE_MANAGER
     // Take the page manager out altogether because some unices don't
     // know how to reserve VM -- only preallocate it which takes up a lot 
     // of space.