chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: Fix typo
[elogind.git]
/
src
/
libsystemd-bus
/
test-bus-marshal.c
diff --git
a/src/libsystemd-bus/test-bus-marshal.c
b/src/libsystemd-bus/test-bus-marshal.c
index d12c847f352140eadde4b0ccf87b330acb65d8be..20ae723fbe1a3640014399ec98c690f81f86d485 100644
(file)
--- 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;
GDBusMessage *g;
char *p;
+#if !defined(GLIB_VERSION_2_36)
g_type_init();
g_type_init();
+#endif
g = g_dbus_message_new_from_blob(buffer, sz, 0, NULL);
p = g_dbus_message_print(g, 0);
g = g_dbus_message_new_from_blob(buffer, sz, 0, NULL);
p = g_dbus_message_print(g, 0);
@@
-121,7
+123,7
@@
int main(int argc, char *argv[]) {
m = sd_bus_message_unref(m);
m = sd_bus_message_unref(m);
- r = bus_message_from_malloc(buffer, sz, &m);
+ r = bus_message_from_malloc(buffer, sz,
NULL, 0, NULL, NULL,
&m);
assert_se(r >= 0);
bus_message_dump(m);
assert_se(r >= 0);
bus_message_dump(m);