зеркало из https://github.com/mozilla/pjs.git
Bug 314138. Don't use obsolete InitXPCOM, allow InitXPCOM to find the static modules. r+sr=bsmedberg
This commit is contained in:
Родитель
4c35f79954
Коммит
e27280dcf7
|
@ -76,7 +76,6 @@
|
|||
// app component registration
|
||||
#include <nsIGenericFactory.h>
|
||||
#include <nsIComponentRegistrar.h>
|
||||
#include "nsStaticComponents.h"
|
||||
|
||||
// all of our local includes
|
||||
#include "EmbedPrivate.h"
|
||||
|
@ -97,11 +96,6 @@
|
|||
#include "nsIDOMDocument.h"
|
||||
#endif
|
||||
|
||||
#ifndef _BUILD_STATIC_BIN
|
||||
nsStaticModuleInfo const *const kPStaticModules = nsnull;
|
||||
PRUint32 const kStaticModuleCount = 0;
|
||||
#endif
|
||||
|
||||
static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
|
||||
|
||||
PRUint32 EmbedPrivate::sWidgetCount = 0;
|
||||
|
@ -488,7 +482,7 @@ EmbedPrivate::PushStartup(void)
|
|||
return;
|
||||
}
|
||||
|
||||
rv = NS_InitEmbedding(binDir, sAppFileLocProvider, kPStaticModules, kStaticModuleCount);
|
||||
rv = NS_InitEmbedding(binDir, sAppFileLocProvider);
|
||||
if (NS_FAILED(rv))
|
||||
return;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче