aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2013-07-18 14:21:17 +0200
committerMartin Willi <martin@revosec.ch>2013-07-18 14:21:17 +0200
commit896abbefc5f9d7dd97a5f591fc033f307f38172e (patch)
tree648740165470a7bf8d88385a53cc639fdc9f09a3 /src
parent2d5a20061a44bf3fe5fe8c6c9607fc4c95330f00 (diff)
downloadstrongswan-896abbefc5f9d7dd97a5f591fc033f307f38172e.tar.bz2
strongswan-896abbefc5f9d7dd97a5f591fc033f307f38172e.tar.xz
nm: omit deprecated g_type_init() when using >= GLIB 2.36
Diffstat (limited to 'src')
-rw-r--r--src/charon-nm/nm/nm_backend.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/charon-nm/nm/nm_backend.c b/src/charon-nm/nm/nm_backend.c
index c83978291..f474dad60 100644
--- a/src/charon-nm/nm/nm_backend.c
+++ b/src/charon-nm/nm/nm_backend.c
@@ -116,7 +116,9 @@ static bool nm_backend_init()
{
nm_backend_t *this;
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init ();
+#endif
#if !GLIB_CHECK_VERSION(2,23,0)
if (!g_thread_supported())