mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 14:22:01 +00:00
make mork a dll
This commit is contained in:
parent
ca3a9995a7
commit
96a1f19ba3
@ -22,7 +22,7 @@ srcdir = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
DIRS = public src build
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
|
@ -19,6 +19,6 @@ DEPTH=..\..\..
|
||||
|
||||
#tests no tests yet or public yet
|
||||
|
||||
DIRS=src
|
||||
DIRS=src build
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
@ -12,7 +12,7 @@
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Copyright (C) 1998-1999 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
|
||||
|
||||
|
@ -22,7 +22,7 @@ srcdir = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
DIRS = public src build
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
|
@ -19,6 +19,6 @@ DEPTH=..\..\..
|
||||
|
||||
#tests no tests yet or public yet
|
||||
|
||||
DIRS=src
|
||||
DIRS=src build
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
@ -12,7 +12,7 @@
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Copyright (C) 1998-1999 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
|
||||
|
||||
|
@ -39,7 +39,6 @@ LLIBS= \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\msgbaseutil.lib \
|
||||
$(DIST)\lib\msgdb_s.lib \
|
||||
$(DIST)\lib\msgmork_s.lib \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(NULL)
|
||||
|
@ -25,17 +25,17 @@
|
||||
|
||||
// a86c86ae-e97f-11d2-a506-0060b0fc04b7
|
||||
#define NS_MAILDB_CID \
|
||||
{ 0xa86c86ae, 0xe97f, 0xa506, \
|
||||
{ 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } }
|
||||
{ 0xa86c86ae, 0xe97f, 0x11d2, \
|
||||
{ 0xa5, 0x06, 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } }
|
||||
|
||||
// 36414aa0-e980-11d2-a506-0060b0fc04b7
|
||||
#define NS_NEWSDB_CID \
|
||||
{ 0x36414aa0, 0xe980, 0x11d2, \
|
||||
{ 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } }
|
||||
{ 0xa5, 0x06, 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } }
|
||||
|
||||
// 9e4b07ee-e980-11d2-a506-0060b0fc04b7
|
||||
#define NS_IMAPDB_CID \
|
||||
{ 0x9e4b07ee, 0xe980, 0x11d2, \
|
||||
{ 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } }
|
||||
{ 0xa5, 0x06, 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } }
|
||||
|
||||
#endif
|
||||
|
@ -44,7 +44,6 @@ EXTRA_DSO_LDOPTS = \
|
||||
$(NSPR_LIBS) \
|
||||
-lxpcom \
|
||||
-lreg \
|
||||
-lmork \
|
||||
-lmsgbaseutil \
|
||||
$(NULL)
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Copyright (C) 1998-1999 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
|
||||
DEPTH=..\..\..\..
|
||||
|
@ -28,13 +28,16 @@
|
||||
#include "nsString.h"
|
||||
#include "nsIMsgHeaderParser.h"
|
||||
#include "nsMsgBaseCID.h"
|
||||
|
||||
#include "nsMorkCID.h"
|
||||
#include "nsIMdbFactoryFactory.h"
|
||||
#include "nsIMimeConverter.h"
|
||||
|
||||
#include "nsILocale.h"
|
||||
#include "nsLocaleCID.h"
|
||||
#include "nsILocaleFactory.h"
|
||||
|
||||
static NS_DEFINE_CID(kCMorkFactory, NS_MORK_CID);
|
||||
|
||||
#if defined(XP_MAC) && defined(CompareString)
|
||||
#undef CompareString
|
||||
#endif
|
||||
@ -372,17 +375,12 @@ NS_IMETHODIMP nsMsgDatabase::QueryInterface(REFNSIID aIID, void** aResult)
|
||||
return NS_NOINTERFACE;
|
||||
}
|
||||
|
||||
extern nsIMdbFactory *NS_NewIMdbFactory();
|
||||
|
||||
/* static */ nsIMdbFactory *nsMsgDatabase::GetMDBFactory()
|
||||
{
|
||||
static nsIMdbFactory *gMDBFactory = NULL;
|
||||
static nsIMdbFactory *gMDBFactory = nsnull;
|
||||
if (!gMDBFactory)
|
||||
{
|
||||
gMDBFactory = MakeMdbFactory(); //new nsIMdbFactory;
|
||||
#if 0
|
||||
nsComponentManager::CreateInstance(
|
||||
#endif
|
||||
nsresult rv = nsComponentManager::CreateInstance(kCMorkFactory, nsnull, nsIMdbFactoryFactory::GetIID(), (void **) &gMDBFactory);
|
||||
}
|
||||
return gMDBFactory;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user