From 69c6a601769c0c642acbfd28c2924fef3140b2b1 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 24 Jan 2013 18:17:27 +0100 Subject: [PATCH] g_thread_init() is deprecated since Glib 2.23 --- src/charon-nm/nm/nm_backend.c | 3 +++ src/libstrongswan/plugins/soup/soup_plugin.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/charon-nm/nm/nm_backend.c b/src/charon-nm/nm/nm_backend.c index f36cf1f..5bb2ed9 100644 --- a/src/charon-nm/nm/nm_backend.c +++ b/src/charon-nm/nm/nm_backend.c @@ -117,10 +117,13 @@ static bool nm_backend_init() nm_backend_t *this; g_type_init (); + +#if !GLIB_CHECK_VERSION(2,23,0) if (!g_thread_supported()) { g_thread_init(NULL); } +#endif INIT(this, .creds = nm_creds_create(), diff --git a/src/libstrongswan/plugins/soup/soup_plugin.c b/src/libstrongswan/plugins/soup/soup_plugin.c index b21b28b..1260a5a 100644 --- a/src/libstrongswan/plugins/soup/soup_plugin.c +++ b/src/libstrongswan/plugins/soup/soup_plugin.c @@ -66,10 +66,13 @@ plugin_t *soup_plugin_create() private_soup_plugin_t *this; g_type_init(); + +#if !GLIB_CHECK_VERSION(2,23,0) if (!g_thread_get_initialized()) { g_thread_init(NULL); } +#endif INIT(this, .public = { -- 2.7.4