Compiler warning fixes.

g_thread_init is automatically called since 2.32 (and deprecated since 2.35).
g_type_init is automatically called since 2.36 and will be deprecated in the
future.
This commit is contained in:
Aleric Inglewood
2014-07-11 16:54:06 +02:00
parent a4b3c3d1ad
commit 6ccca51fee
6 changed files with 23 additions and 2 deletions

View File

@@ -229,12 +229,16 @@ private:
std::string application_dir = std::string( cwd );
#if LL_LINUX
#if !GLIB_CHECK_VERSION(2, 36, 0)
#if !GLIB_CHECK_VERSION(2, 32, 0)
// take care to initialize glib properly, because some
// versions of Qt don't, and we indirectly need it for (some
// versions of) Flash to not crash the browser.
if (!g_thread_supported ()) g_thread_init (NULL);
#endif
g_type_init();
#endif
#endif
#if LL_DARWIN
// When running under the Xcode debugger, there's a setting called "Break on Debugger()/DebugStr()" which defaults to being turned on.