This commit is contained in:
warren%netscape.com 1999-09-26 07:26:21 +00:00
Родитель 3b7cb74794
Коммит 9c1b7ede80
4 изменённых файлов: 11 добавлений и 5 удалений

Просмотреть файл

@ -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,

Просмотреть файл

@ -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 \

Просмотреть файл

@ -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 \

Просмотреть файл

@ -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.