5 files changed, 13 insertions, 1 deletions
diff --git a/bin/tools/benchmark.c b/bin/tools/benchmark.c
index fee40f2..1e2c79f 100644
--- a/bin/tools/benchmark.c
+++ b/bin/tools/benchmark.c
@@ -228,7 +228,10 @@ main (int argc, char *argv[])
     };
 
     (void) signal (SIGINT, sigint_handler);
+
+#if !(GLIB_CHECK_VERSION (2, 36, 0))
     g_type_init ();
+#endif
 
     manager = uca_plugin_manager_new ();
     context = uca_option_context_new (manager);
diff --git a/bin/tools/gen-doc.c b/bin/tools/gen-doc.c
index d27bdd8..026d828 100644
--- a/bin/tools/gen-doc.c
+++ b/bin/tools/gen-doc.c
@@ -196,7 +196,9 @@ int main(int argc, char *argv[])
     gchar *name;
     GError *error = NULL;
 
+#if !(GLIB_CHECK_VERSION (2, 36, 0))
     g_type_init();
+#endif
     manager = uca_plugin_manager_new ();
 
     if (argc < 2) {
diff --git a/bin/tools/grab.c b/bin/tools/grab.c
index 5825ce7..f355fcb 100644
--- a/bin/tools/grab.c
+++ b/bin/tools/grab.c
@@ -235,7 +235,9 @@ main (int argc, char *argv[])
         { NULL }
     };
 
+#if !(GLIB_CHECK_VERSION (2, 36, 0))
     g_type_init();
+#endif
 
     manager = uca_plugin_manager_new ();
     context = uca_option_context_new (manager);
diff --git a/test/test-mock.c b/test/test-mock.c
index 10c0a36..facae53 100644
--- a/test/test-mock.c
+++ b/test/test-mock.c
@@ -223,7 +223,9 @@ test_signal (Fixture *fixture, gconstpointer data)
 
 int main (int argc, char *argv[])
 {
+#if !(GLIB_CHECK_VERSION (2, 36, 0))
     g_type_init ();
+#endif
 
     g_test_init (&argc, &argv, NULL);
     g_test_bug_base ("http://ufo.kit.edu/ufo/ticket");
diff --git a/test/test-ring-buffer.c b/test/test-ring-buffer.c
index b9ff210..e868cd4 100644
--- a/test/test-ring-buffer.c
+++ b/test/test-ring-buffer.c
@@ -53,7 +53,7 @@ test_ring (void)
     uca_ring_buffer_write_advance (buffer);
 
     g_assert (uca_ring_buffer_get_num_blocks (buffer) == 2);
-    
+
     data = uca_ring_buffer_get_read_pointer (buffer);
     g_assert (data[0] == 0xBADF00D);
 
@@ -89,7 +89,10 @@ test_overwrite (void)
 int
 main (int argc, char *argv[])
 {
+#if !(GLIB_CHECK_VERSION (2, 36, 0))
     g_type_init ();
+#endif
+
     g_test_init (&argc, &argv, NULL);
 
     g_test_add_func ("/ringbuffer/new/constructor", test_new_constructor);