xserver: Branch 'master'

[GitLab Mirror]

 config/dbus-core.c                           |    3 ++-
 config/hal.c                                 |    3 ++-
 hw/xfree86/common/xf86Init.c                 |    2 +-
 hw/xfree86/os-support/linux/systemd-logind.c |    3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 8982344e53cb5954a65fdf0e95d17a7f2bc6142a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Mar 4 20:02:18 2024 +0100

    include: move dbus-core.h to config
    
    This header is internal (not installed) and holds definitions for sources
    in config/, thus it fells more clean moving it to config/, too.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1357>

diff --git a/config/dbus-core.c b/config/dbus-core.c
index 6d9a3f917..180ca9364 100644
--- a/config/dbus-core.c
+++ b/config/dbus-core.c
@@ -32,7 +32,8 @@
 
 #include "dix.h"
 #include "os.h"
-#include "dbus-core.h"
+
+#include "config/dbus-core.h"
 
 /* How often to attempt reconnecting when we get booted off the bus. */
 #define RECONNECT_DELAY (10 * 1000)     /* in ms */
diff --git a/include/dbus-core.h b/config/dbus-core.h
similarity index 100%
rename from include/dbus-core.h
rename to config/dbus-core.h
diff --git a/config/hal.c b/config/hal.c
index e33e3330b..7e0e88498 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -33,7 +33,8 @@
 #include <string.h>
 #include <sys/select.h>
 
-#include "dbus-core.h"
+#include "config/dbus-core.h"
+
 #include "input.h"
 #include "inputstr.h"
 #include "hotplug.h"
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 54f8dd76e..93f14318d 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -49,6 +49,7 @@
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
 
+#include "config/dbus-core.h"
 #include "dix/screenint_priv.h"
 #include "os/cmdline.h"
 #include "os/osdep.h"
@@ -58,7 +59,6 @@
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "mi.h"
-#include "dbus-core.h"
 #include "systemd-logind.h"
 #include "loaderProcs.h"
 
diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c
index 16a9df675..c6a24fc7b 100644
--- a/hw/xfree86/os-support/linux/systemd-logind.c
+++ b/hw/xfree86/os-support/linux/systemd-logind.c
@@ -32,8 +32,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "config/dbus-core.h"
+
 #include "os.h"
-#include "dbus-core.h"
 #include "linux.h"
 #include "xf86.h"
 #include "xf86platformBus.h"