xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/bsd/bsd_bell.c |    4 ----
 hw/xfree86/os-support/xf86_OSlib.h   |    4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cac0d081022edce23e9fa172d1d9f4148732e316
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Nov 13 16:47:52 2024 -0800

    Revert "xfree86: os-support: move CONSOLE_X_BELL into bsd_bell.c"
    
    This reverts commit 8958a99c02049e7883443d4da49544d3e39ee42e.
    It broke the build of the xf86-input-keyboard driver, which relies
    on CONSOLE_X_BELL in src/bsd_kbd.c.
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1741>

diff --git a/hw/xfree86/os-support/bsd/bsd_bell.c b/hw/xfree86/os-support/bsd/bsd_bell.c
index 1a60a8ad9..2b0bba2f6 100644
--- a/hw/xfree86/os-support/bsd/bsd_bell.c
+++ b/hw/xfree86/os-support/bsd/bsd_bell.c
@@ -38,10 +38,6 @@
 #include "xf86_os_support.h"
 #include "xf86_OSlib.h"
 
-#ifndef CONSOLE_X_BELL
-#define CONSOLE_X_BELL _IOW('t',123,int[2])
-#endif
-
 void
 xf86OSRingBell(int loudness, int pitch, int duration)
 {
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 2508eaa06..f973ace86 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -195,6 +195,10 @@ struct pcvtid {
 #endif                          /* WSCONS_SUPPORT */
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 #include <sys/mouse.h>
+#endif
+    /* Include these definitions in case ioctl_pc.h didn't get included */
+#ifndef CONSOLE_X_BELL
+#define CONSOLE_X_BELL _IOW('t',123,int[2])
 #endif
 
 #define CLEARDTR_SUPPORT