зеркало из https://github.com/mozilla/gecko-dev.git
fix some bustage
This commit is contained in:
Родитель
f68444879d
Коммит
55c615c93e
|
@ -333,7 +333,9 @@ nsresult NS_COM NS_InitXPCOM2(nsIServiceManager* *result,
|
||||||
rv = nsMemoryImpl::Startup();
|
rv = nsMemoryImpl::Startup();
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
|
#ifdef XP_UNIX
|
||||||
NS_StartupNativeCharsetUtils();
|
NS_StartupNativeCharsetUtils();
|
||||||
|
#endif
|
||||||
NS_StartupLocalFile();
|
NS_StartupLocalFile();
|
||||||
|
|
||||||
StartupSpecialSystemDirectory();
|
StartupSpecialSystemDirectory();
|
||||||
|
@ -587,7 +589,9 @@ nsresult NS_COM NS_ShutdownXPCOM(nsIServiceManager* servMgr)
|
||||||
|
|
||||||
// Shutdown nsLocalFile string conversion
|
// Shutdown nsLocalFile string conversion
|
||||||
NS_ShutdownLocalFile();
|
NS_ShutdownLocalFile();
|
||||||
|
#ifdef XP_UNIX
|
||||||
NS_ShutdownNativeCharsetUtils();
|
NS_ShutdownNativeCharsetUtils();
|
||||||
|
#endif
|
||||||
|
|
||||||
// Shutdown the timer thread and all timers that might still be alive before
|
// Shutdown the timer thread and all timers that might still be alive before
|
||||||
// shutting down the component manager
|
// shutting down the component manager
|
||||||
|
|
Загрузка…
Ссылка в новой задаче