summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2013-04-04 09:02:28 +0200
committerHarald Hoyer <harald@redhat.com>2013-04-04 17:43:21 +0200
commit34f856cbd013a73ba5d7f05fe6e9ff0233b92f15 (patch)
treecd9133f263fd9a8baee5f9191d858098b9379c75 /src
parent68395007f39b326978d7936f203be8fcd24bd222 (diff)
test-bus-marshal.c: do not call g_type_init() for modern glib versions
Diffstat (limited to 'src')
-rw-r--r--src/libsystemd-bus/test-bus-marshal.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsystemd-bus/test-bus-marshal.c b/src/libsystemd-bus/test-bus-marshal.c
index e7d0cc7d72..20ae723fbe 100644
--- a/src/libsystemd-bus/test-bus-marshal.c
+++ b/src/libsystemd-bus/test-bus-marshal.c
@@ -96,7 +96,9 @@ int main(int argc, char *argv[]) {
GDBusMessage *g;
char *p;
+#if !defined(GLIB_VERSION_2_36)
g_type_init();
+#endif
g = g_dbus_message_new_from_blob(buffer, sz, 0, NULL);
p = g_dbus_message_print(g, 0);