X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-export.c;h=b5a4b9e39796c3cbd219bcd722c59235f3972c57;hb=d7e4faba5d1744160d538edd74bc4bdd8a173b1a;hp=0023f71eb83b7daa1ff832a8f4edf44ede6874f8;hpb=418ba126a955ee38804152c6c905ff200bbc1a92;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-export.c b/src/afb-export.c
index 0023f71e..b5a4b9e3 100644
--- a/src/afb-export.c
+++ b/src/afb-export.c
@@ -39,7 +39,6 @@
 #include "afb-api-so-v2.h"
 #include "afb-api-v3.h"
 #include "afb-common.h"
-#include "afb-systemd.h"
 #include "afb-cred.h"
 #include "afb-evt.h"
 #include "afb-export.h"
@@ -48,6 +47,8 @@
 #include "afb-session.h"
 #include "afb-xreq.h"
 #include "afb-calls.h"
+
+#include "systemd.h"
 #include "jobs.h"
 #include "verbose.h"
 #include "globset.h"
@@ -450,21 +451,21 @@ static int hooked_event_broadcast_cb(struct afb_api_x3 *closure, const char *nam
 static struct sd_event *hooked_get_event_loop(struct afb_api_x3 *closure)
 {
 	struct afb_export *export = from_api_x3(closure);
-	struct sd_event *r = afb_systemd_get_event_loop();
+	struct sd_event *r = systemd_get_event_loop();
 	return afb_hook_api_get_event_loop(export, r);
 }
 
 static struct sd_bus *hooked_get_user_bus(struct afb_api_x3 *closure)
 {
 	struct afb_export *export = from_api_x3(closure);
-	struct sd_bus *r = afb_systemd_get_user_bus();
+	struct sd_bus *r = systemd_get_user_bus();
 	return afb_hook_api_get_user_bus(export, r);
 }
 
 static struct sd_bus *hooked_get_system_bus(struct afb_api_x3 *closure)
 {
 	struct afb_export *export = from_api_x3(closure);
-	struct sd_bus *r = afb_systemd_get_system_bus();
+	struct sd_bus *r = systemd_get_system_bus();
 	return afb_hook_api_get_system_bus(export, r);
 }
 
@@ -536,9 +537,9 @@ static const struct afb_daemon_itf_x1 daemon_itf = {
 	.vverbose_v2 = vverbose_cb,
 	.event_make = legacy_event_x1_make_cb,
 	.event_broadcast = event_broadcast_cb,
-	.get_event_loop = afb_systemd_get_event_loop,
-	.get_user_bus = afb_systemd_get_user_bus,
-	.get_system_bus = afb_systemd_get_system_bus,
+	.get_event_loop = systemd_get_event_loop,
+	.get_user_bus = systemd_get_user_bus,
+	.get_system_bus = systemd_get_system_bus,
 	.rootdir_get_fd = afb_common_rootdir_get_fd,
 	.rootdir_open_locale = rootdir_open_locale_cb,
 	.queue_job = queue_job_cb,
@@ -1051,9 +1052,9 @@ static const struct afb_api_x3_itf api_x3_itf = {
 
 	.vverbose = (void*)vverbose_cb,
 
-	.get_event_loop = afb_systemd_get_event_loop,
-	.get_user_bus = afb_systemd_get_user_bus,
-	.get_system_bus = afb_systemd_get_system_bus,
+	.get_event_loop = systemd_get_event_loop,
+	.get_user_bus = systemd_get_user_bus,
+	.get_system_bus = systemd_get_system_bus,
 	.rootdir_get_fd = afb_common_rootdir_get_fd,
 	.rootdir_open_locale = rootdir_open_locale_cb,
 	.queue_job = queue_job_cb,