strongswan.org
Wiki/Project Management
Downloads
Gitweb
projects
/
strongswan.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2d5a200
)
nm: omit deprecated g_type_init() when using >= GLIB 2.36
author
Martin Willi
<martin@revosec.ch>
Thu, 18 Jul 2013 12:21:17 +0000
(14:21 +0200)
committer
Martin Willi
<martin@revosec.ch>
Thu, 18 Jul 2013 12:21:17 +0000
(14:21 +0200)
src/charon-nm/nm/nm_backend.c
patch
|
blob
|
history
diff --git
a/src/charon-nm/nm/nm_backend.c
b/src/charon-nm/nm/nm_backend.c
index
c839782
..
f474dad
100644
(file)
--- 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())