mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-30 00:01:50 +00:00
move gtk_init to after NS_TraceMallocStartupArgs to fix tracemalloc bustage
This commit is contained in:
parent
e101df3686
commit
dd3782698c
@ -1790,14 +1790,6 @@ int xre_main(int argc, char* argv[], const nsXREAppData& aAppData)
|
||||
InitializeMacOSXApp(argc, argv);
|
||||
#endif
|
||||
|
||||
#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
|
||||
// Initialize GTK+1/2 here for splash
|
||||
#if defined(MOZ_WIDGET_GTK)
|
||||
gtk_set_locale();
|
||||
#endif
|
||||
gtk_init(&argc, &argv);
|
||||
#endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */
|
||||
|
||||
#ifdef _BUILD_STATIC_BIN
|
||||
// Initialize XPCOM's module info table
|
||||
NSGetStaticModuleInfo = app_getModuleInfo;
|
||||
@ -1812,6 +1804,14 @@ int xre_main(int argc, char* argv[], const nsXREAppData& aAppData)
|
||||
argc = NS_TraceMallocStartupArgs(argc, argv);
|
||||
#endif
|
||||
|
||||
#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
|
||||
// Initialize GTK+1/2 here for splash
|
||||
#if defined(MOZ_WIDGET_GTK)
|
||||
gtk_set_locale();
|
||||
#endif
|
||||
gtk_init(&argc, &argv);
|
||||
#endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */
|
||||
|
||||
// Call the code to install our handler
|
||||
#ifdef MOZ_JPROF
|
||||
setupProfilingStuff();
|
||||
|
Loading…
Reference in New Issue
Block a user