xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/xf86_OSlib.h |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 0cb8a76a9f3ec89e26a6aef489a3a9cca990980e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 14 20:35:56 2024 +0100

    xfree86: os-support: drop obsolete Solaris specific LED defines
    
    Historical legacy: the LED ID defines have/had different naming across various
    platforms - for better portability of the keyboard driver, those have been
    aliased to BSD's naming scheme. Meanwhile, lots of ancient platforms have
    been died or moved to other drivers (eg. Linux went to either evdev or libinput
    and not supported by the xf86-input-keyboard driver anymore).
    
    The only remaining possible consumer is Solaris. But it has it's own dedicated
    code (sun_kbd.c in xf86-input-keyboard), which already using the Solaris' naming.
    
    Therefore, there's no actual consumer of them left, so we can drop them.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1418>

diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 4afd7f86f..e15204cb4 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -151,11 +151,6 @@ extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX];
 #undef STRING
 #undef LEFTALT
 #undef RIGHTALT
-
-#define LED_CAP LED_CAPS_LOCK
-#define LED_NUM LED_NUM_LOCK
-#define LED_SCR LED_SCROLL_LOCK
-#define LED_COMP LED_COMPOSE
 #endif                          /* __sun */
 
 #if !defined(VT_ACKACQ)