wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 568691 Further followup to actually register static components r=bsmedberg

Browse Source
This commit is contained in:
Neil Rashbrook 2010-07-13 15:24:58 +01:00
parent c45d8e580b
commit 3ab5e497d0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/xre/nsAppRunner.cpp
View File

@ -1153,8 +1153,14 @@ ScopedXPCOMStartup::Initialize()
mozilla::SetOmnijar(lf);
#endif
#if !defined(_BUILD_STATIC_BIN) && !defined(MOZ_ENABLE_LIBXUL)
#ifndef MOZ_ENABLE_LIBXUL
#ifndef _BUILD_STATIC_BIN
XRE_AddStaticComponent(&kXREModule);
#else
for (const mozilla::Module *const *staticModules = kPStaticModules;
*staticModules; ++staticModules)
XRE_AddStaticComponent(*staticModules);
#endif
#endif
rv = NS_InitXPCOM2(&mServiceManager, gDirServiceProvider->GetAppDir(),

2
xpcom/components/nsComponentManager.cpp
View File

@ -316,7 +316,7 @@ nsComponentManagerImpl::InitializeStaticModules()
return;
sStaticModules = new nsTArray<const mozilla::Module*>;
#if defined(_BUILD_STATIC_BIN) || defined(MOZ_ENABLE_LIBXUL)
#ifdef MOZ_ENABLE_LIBXUL
for (const mozilla::Module *const *staticModules = kPStaticModules;
*staticModules; ++staticModules)
sStaticModules->AppendElement(*staticModules);