xserver: Branch 'master'

[GitLab Mirror]

 include/xkbsrv.h |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit c5e88238f255487b2b9c5b4d4e2682aa03ca7f70
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Apr 3 13:50:43 2024 +0200

    xkb: drop unused defines
    
    These aren't used anywhere, neither in Xserver nor drivers,
    for about 11 years now. Fallout of removing component listing support.
    
    Fixes: 710065da37b68a9ec7a0c9dc995247f39e3d01e9
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1458>

diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index d19946ede..bd747856b 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -855,13 +855,6 @@ extern _X_EXPORT void XkbCopyControls(XkbDescPtr /* dst */ ,
 #include "xkbfile.h"
 #include "xkbrules.h"
 
-#define	_XkbListKeycodes	0
-#define	_XkbListTypes		1
-#define	_XkbListCompat		2
-#define	_XkbListSymbols		3
-#define	_XkbListGeometry	4
-#define	_XkbListNumComponents	5
-
 extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(DeviceIntPtr /* keybd */ ,
                                                       XkbComponentNamesPtr
                                                       /* names */ ,