From: Yu Watanabe Date: Mon, 28 May 2018 04:36:35 +0000 (+0900) Subject: core: include sd-bus-vtable.h in dbus-*.h X-Git-Tag: v239~199^2~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19e69a9c7a3a84f25d4c21c7c7f8f60c24685432;p=thirdparty%2Fsystemd.git core: include sd-bus-vtable.h in dbus-*.h --- diff --git a/src/core/dbus-automount.h b/src/core/dbus-automount.h index 2d4079a7b47..755bdab1b6a 100644 --- a/src/core/dbus-automount.h +++ b/src/core/dbus-automount.h @@ -7,6 +7,11 @@ Copyright 2010 Lennart Poettering ***/ +#include "sd-bus.h" +#include "sd-bus-vtable.h" + +#include "unit.h" + extern const sd_bus_vtable bus_automount_vtable[]; int bus_automount_set_property(Unit *u, const char *name, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error); diff --git a/src/core/dbus-cgroup.h b/src/core/dbus-cgroup.h index b0cd63ebc30..72f135d29c7 100644 --- a/src/core/dbus-cgroup.h +++ b/src/core/dbus-cgroup.h @@ -8,6 +8,7 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" #include "unit.h" #include "cgroup.h" diff --git a/src/core/dbus-device.h b/src/core/dbus-device.h index c0f8f79adf9..eca3559d6e1 100644 --- a/src/core/dbus-device.h +++ b/src/core/dbus-device.h @@ -7,6 +7,6 @@ Copyright 2010 Lennart Poettering ***/ -#include "unit.h" +#include "sd-bus-vtable.h" extern const sd_bus_vtable bus_device_vtable[]; diff --git a/src/core/dbus-execute.h b/src/core/dbus-execute.h index 56b04b57219..fbf8b483b18 100644 --- a/src/core/dbus-execute.h +++ b/src/core/dbus-execute.h @@ -8,6 +8,7 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" #include "execute.h" diff --git a/src/core/dbus-job.h b/src/core/dbus-job.h index 819e69f3d4b..6e332b3082b 100644 --- a/src/core/dbus-job.h +++ b/src/core/dbus-job.h @@ -8,6 +8,7 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" #include "job.h" diff --git a/src/core/dbus-kill.h b/src/core/dbus-kill.h index e764e4e101c..6d5197a0d3a 100644 --- a/src/core/dbus-kill.h +++ b/src/core/dbus-kill.h @@ -8,6 +8,7 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" #include "kill.h" #include "unit.h" diff --git a/src/core/dbus-manager.h b/src/core/dbus-manager.h index 86f33931a9c..c0a6ab93cf6 100644 --- a/src/core/dbus-manager.h +++ b/src/core/dbus-manager.h @@ -7,6 +7,8 @@ Copyright 2010 Lennart Poettering ***/ +#include "sd-bus-vtable.h" + #include "manager.h" extern const sd_bus_vtable bus_manager_vtable[]; diff --git a/src/core/dbus-mount.h b/src/core/dbus-mount.h index 66a675935ea..d6c480f5776 100644 --- a/src/core/dbus-mount.h +++ b/src/core/dbus-mount.h @@ -8,6 +8,7 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" #include "unit.h" diff --git a/src/core/dbus-path.h b/src/core/dbus-path.h index 5d729cdefca..ea12de5fb86 100644 --- a/src/core/dbus-path.h +++ b/src/core/dbus-path.h @@ -8,6 +8,7 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" #include "unit.h" diff --git a/src/core/dbus-scope.h b/src/core/dbus-scope.h index 115886b134a..31ccbb47f94 100644 --- a/src/core/dbus-scope.h +++ b/src/core/dbus-scope.h @@ -8,8 +8,10 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" #include "scope.h" +#include "unit.h" extern const sd_bus_vtable bus_scope_vtable[]; diff --git a/src/core/dbus-service.h b/src/core/dbus-service.h index f96d426a9ca..bc684ac80cb 100644 --- a/src/core/dbus-service.h +++ b/src/core/dbus-service.h @@ -8,6 +8,7 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" #include "unit.h" diff --git a/src/core/dbus-slice.h b/src/core/dbus-slice.h index 3a02fa64d00..5760cd8d61e 100644 --- a/src/core/dbus-slice.h +++ b/src/core/dbus-slice.h @@ -8,6 +8,7 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" #include "unit.h" diff --git a/src/core/dbus-socket.h b/src/core/dbus-socket.h index 7743031a108..59db02686c4 100644 --- a/src/core/dbus-socket.h +++ b/src/core/dbus-socket.h @@ -8,6 +8,7 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" #include "unit.h" diff --git a/src/core/dbus-swap.h b/src/core/dbus-swap.h index 88e2b211ad3..da089d2ea4b 100644 --- a/src/core/dbus-swap.h +++ b/src/core/dbus-swap.h @@ -9,6 +9,7 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" #include "unit.h" diff --git a/src/core/dbus-target.h b/src/core/dbus-target.h index 8c1a5ec5231..76f0f1a34e4 100644 --- a/src/core/dbus-target.h +++ b/src/core/dbus-target.h @@ -7,6 +7,6 @@ Copyright 2010 Lennart Poettering ***/ -#include "sd-bus.h" +#include "sd-bus-vtable.h" extern const sd_bus_vtable bus_target_vtable[]; diff --git a/src/core/dbus-timer.h b/src/core/dbus-timer.h index ff3ad6cf6d4..1cfc9bf9be5 100644 --- a/src/core/dbus-timer.h +++ b/src/core/dbus-timer.h @@ -8,6 +8,7 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" #include "unit.h" diff --git a/src/core/dbus-unit.h b/src/core/dbus-unit.h index 7fce07d1e96..8c55d7dfdf3 100644 --- a/src/core/dbus-unit.h +++ b/src/core/dbus-unit.h @@ -8,7 +8,9 @@ ***/ #include "sd-bus.h" +#include "sd-bus-vtable.h" +#include "job.h" #include "unit.h" extern const sd_bus_vtable bus_unit_vtable[]; diff --git a/src/core/dbus-util.h b/src/core/dbus-util.h index b1f7b69d796..73d1ebd3136 100644 --- a/src/core/dbus-util.h +++ b/src/core/dbus-util.h @@ -8,6 +8,7 @@ ***/ #include "sd-bus.h" + #include "unit.h" int bus_property_get_triggered_unit(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error); diff --git a/src/core/dbus.h b/src/core/dbus.h index f13f607111c..1ef1fa27fdf 100644 --- a/src/core/dbus.h +++ b/src/core/dbus.h @@ -7,6 +7,8 @@ Copyright 2010 Lennart Poettering ***/ +#include "sd-bus.h" + #include "manager.h" int bus_send_queued_message(Manager *m);