Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge trunk changes.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/ZAP_20050610_BRANCH@193326 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alex%croczilla.com
2006-03-31 13:27:53 +00:00
parent 86bfc212d1
commit 134bbb58df
5 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/netwerk/build/nsNetModule.cpp
View File

@@ -39,6 +39,7 @@
#include "nsCOMPtr.h"
#include "nsIModule.h"
#include "nsIClassInfoImpl.h"
#include "nsIGenericFactory.h"
#include "nsIComponentManager.h"
#include "nsIServiceManager.h"
@@ -79,6 +80,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDNSService, Init)
#include "nsProtocolProxyService.h"
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsProtocolProxyService, Init)
NS_DECL_CLASSINFO(nsProtocolProxyService)
#include "nsStreamTransportService.h"
NS_GENERIC_FACTORY_CONSTRUCTOR(nsStreamTransportService)
@@ -769,7 +771,12 @@ static const nsModuleComponentInfo gNetModuleInfo[] = {
{ NS_PROTOCOLPROXYSERVICE_CLASSNAME,
NS_PROTOCOLPROXYSERVICE_CID,
NS_PROTOCOLPROXYSERVICE_CONTRACTID,
nsProtocolProxyServiceConstructor },
nsProtocolProxyServiceConstructor,
nsnull, nsnull, nsnull,
NS_CI_INTERFACE_GETTER_NAME(nsProtocolProxyService),
nsnull,
&NS_CLASSINFO_NAME(nsProtocolProxyService),
nsIClassInfo::SINGLETON },
// from netwerk/streamconv: