From 2f86d267ccd8dbc59aaefc354a7f00729c8c2d44 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 12 Mar 2024 20:29:51 +0100 Subject: [PATCH] (submit/move-systemd-logind.h) move systemd-logind.h to hw/xfree86/os-support/linux systemd is linux specific and the actual implementation is under the os-support layer of xfree86 ddx. Thus no need to keep it in global include directory, putting it onto the linux specific os-support instead. Signed-off-by: Enrico Weigelt, metux IT consult --- config/config.c | 3 ++- config/udev.c | 3 ++- hw/kdrive/src/kdrive.c | 2 +- hw/xfree86/common/xf86Events.c | 3 ++- hw/xfree86/common/xf86Init.c | 2 +- hw/xfree86/common/xf86Xinput.c | 2 +- hw/xfree86/common/xf86platformBus.c | 2 +- {include => hw/xfree86/os-support/linux}/systemd-logind.h | 0 hw/xfree86/os-support/shared/drm_platform.c | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) rename {include => hw/xfree86/os-support/linux}/systemd-logind.h (100%) diff --git a/config/config.c b/config/config.c index d75f1f453..7568f9ddf 100644 --- a/config/config.c +++ b/config/config.c @@ -32,7 +32,8 @@ #include "os.h" #include "inputstr.h" #include "config-backends.h" -#include "systemd-logind.h" + +#include "../hw/xfree86/os-support/linux/systemd-logind.h" void config_pre_init(void) diff --git a/config/udev.c b/config/udev.c index 83226638d..b98de5ef8 100644 --- a/config/udev.c +++ b/config/udev.c @@ -36,7 +36,8 @@ #include "config-backends.h" #include "os.h" #include "globals.h" -#include "systemd-logind.h" + +#include "../hw/xfree86/os-support/linux/systemd-logind.h" #ifdef HAVE_SYS_SYSMACROS_H #include diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index e2eb847d7..761e57dba 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -53,7 +53,7 @@ /* This stub can be safely removed once we can * split input and GPU parts in hotplug.h et al. */ -#include +#include "../../xfree86/os-support/linux/systemd-logind.h" typedef struct _kdDepths { CARD8 depth; diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 9cf811d5d..78aa68a31 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -91,7 +91,8 @@ #endif #include "xf86platformBus.h" -#include "systemd-logind.h" + +#include "../os-support/linux/systemd-logind.h" extern void (*xf86OSPMClose) (void); diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index b13c9a9d0..3a97e6777 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -63,7 +63,7 @@ #include "windowstr.h" #include "scrnintstr.h" #include "mi.h" -#include "systemd-logind.h" +#include "../os-support/linux/systemd-logind.h" #include "xf86VGAarbiter_priv.h" #include "loaderProcs.h" diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index ab986579f..f940db066 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -68,7 +68,7 @@ #include "xf86Optrec.h" #include "mipointer.h" #include "loaderProcs.h" -#include "systemd-logind.h" +#include "../os-support/linux/systemd-logind.h" #include "exevents.h" /* AddInputDevice */ #include "exglobals.h" #include "eventstr.h" diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c index 2962c8b21..4b2831ff0 100644 --- a/hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c @@ -41,7 +41,7 @@ #include "dix/screenint_priv.h" #include "os.h" -#include "systemd-logind.h" +#include "../os-support/linux/systemd-logind.h" #include "loaderProcs.h" #include "xf86.h" diff --git a/include/systemd-logind.h b/hw/xfree86/os-support/linux/systemd-logind.h similarity index 100% rename from include/systemd-logind.h rename to hw/xfree86/os-support/linux/systemd-logind.h diff --git a/hw/xfree86/os-support/shared/drm_platform.c b/hw/xfree86/os-support/shared/drm_platform.c index f6291e44d..ec72cc1cb 100644 --- a/hw/xfree86/os-support/shared/drm_platform.c +++ b/hw/xfree86/os-support/shared/drm_platform.c @@ -20,7 +20,7 @@ #include "xf86platformBus.h" #include "xf86Bus.h" -#include "systemd-logind.h" +#include "../linux/systemd-logind.h" static Bool get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index)