OJI MozClassic to raptor merge

git-svn-id: svn://10.0.0.236/trunk@18465 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sudu%netscape.com
1999-01-25 08:05:00 +00:00
parent 1174d93a4d
commit d3239a027a
126 changed files with 8119 additions and 4096 deletions

View File

@@ -21,6 +21,7 @@
#include "nsISupports.h"
#include "nsINetService.h"
#include "nsNetService.h"
#include "nsIServiceManager.h"
#include "nsRepository.h"
/* This implementation of the network service factory is presently
@@ -146,9 +147,9 @@ nsresult nsNetFactory::LockFactory(PRBool aLock)
// return the proper factory to the caller
#if defined(XP_MAC) && defined(MAC_STATIC)
extern "C" NS_NET nsresult NSGetFactory_NETLIB_DLL(const nsCID &aClass, nsIFactory **aFactory)
extern "C" NS_NET nsresult NSGetFactory_NETLIB_DLL(const nsCID &aClass, nsISupports* servMgr, nsIFactory **aFactory)
#else
extern "C" NS_NET nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
extern "C" NS_NET nsresult NSGetFactory(const nsCID &aClass, nsISupports* servMgr, nsIFactory **aFactory)
#endif
{
if (nsnull == aFactory) {