From e4ebe3cdf83cfc31620e893092763d36af63cca0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 22 Jan 2020 11:39:22 +0100 Subject: =?UTF-8?q?shared:=20split=20out=20polkit=20stuff=20from=20bus-uti?= =?UTF-8?q?l.c=20=E2=86=92=20bus-polkit.c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's enough, complex stuff to warrant its own source file. No other changes, just splitting out. (Resolve build error from cherry-pick) In bus-util.c, leave fd-util.h and proc-cmdline.h for code preprocessed by ENABLE_KDBUS macro. +#if ENABLE_KDBUS +#include "fd-util.h" +#include "proc-cmdline.h" +#endif Origin: upstream, https://github.com/systemd/systemd/commit/269e4d2d6b75329ae39a71ebe2c14500e03cda95 Change-Id: I9cc9f51f614bf5f8059422cc1923aa88a5812560 Signed-off-by: Youngjae Cho --- src/timedate/timedated.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/timedate') diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 4ec3b50359..5e2fb50d83 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -12,7 +12,7 @@ #include "alloc-util.h" #include "bus-common-errors.h" #include "bus-error.h" -#include "bus-util.h" +#include "bus-polkit.h" #include "clock-util.h" #include "conf-files.h" #include "def.h" -- cgit v1.2.3