summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-07-24 17:10:02 +0200
committerLennart Poettering <lennart@poettering.net>2015-07-24 17:10:02 +0200
commit408d84e50ebd7ca5cb644a7a90a53320f528c5f1 (patch)
tree2a1a2a0c67b70355512703a81126620f7f934a03
parenta60d8280521131e0b80a32eac4ad46403c6ef8c3 (diff)
parent29ddae7b7842c75ec930726015a696839e7538aa (diff)
Merge pull request #713 from daurnimator/577-sd_bus-vtable-methods-do-not-have-offset
sd-bus: remove _VTABLE from new method vtable initialiser
-rw-r--r--src/systemd/sd-bus-vtable.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/systemd/sd-bus-vtable.h b/src/systemd/sd-bus-vtable.h
index b4d6ed03b3..bb4b1eb748 100644
--- a/src/systemd/sd-bus-vtable.h
+++ b/src/systemd/sd-bus-vtable.h
@@ -90,7 +90,7 @@ struct sd_bus_vtable {
.x.start.element_size = sizeof(sd_bus_vtable), \
}
-#define SD_BUS_VTABLE_METHOD_WITH_OFFSET(_member, _signature, _result, _handler, _offset, _flags) \
+#define SD_BUS_METHOD_WITH_OFFSET(_member, _signature, _result, _handler, _offset, _flags) \
{ \
.type = _SD_BUS_VTABLE_METHOD, \
.flags = _flags, \
@@ -101,7 +101,7 @@ struct sd_bus_vtable {
.x.method.offset = _offset, \
}
#define SD_BUS_METHOD(_member, _signature, _result, _handler, _flags) \
- SD_BUS_VTABLE_METHOD_WITH_OFFSET(_member, _signature, _result, _handler, 0, _flags)
+ SD_BUS_METHOD_WITH_OFFSET(_member, _signature, _result, _handler, 0, _flags)
#define SD_BUS_SIGNAL(_member, _signature, _flags) \
{ \