Don't call g_thread_init on glib >=2.31.0
g_thread_init() is deprecated in glib 2.31.0 and later. This will call
g_thread_ini() only when compiling against older versions of glib.
BUG=1971,chromium:253566
R=pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/40019004
Cr-Commit-Position: refs/heads/master@{#8400}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8400 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/examples/peerconnection/client/linux/main.cc b/talk/examples/peerconnection/client/linux/main.cc
index a1b9770..3b39fcc 100644
--- a/talk/examples/peerconnection/client/linux/main.cc
+++ b/talk/examples/peerconnection/client/linux/main.cc
@@ -72,7 +72,11 @@
int main(int argc, char* argv[]) {
gtk_init(&argc, &argv);
g_type_init();
- g_thread_init(NULL);
+ // g_thread_init API is deprecated since glib 2.31.0, see release note:
+ // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.html
+#if !GLIB_CHECK_VERSION(2, 31, 0)
+ g_thread_init(NULL);
+#endif
rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, true);
if (FLAG_help) {
@@ -116,4 +120,3 @@
rtc::CleanupSSL();
return 0;
}
-