xserver: Branch 'master'

[GitLab Mirror]

 config/wscons.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bcf55bded72320ff97632f10fb7e2a9916b68e32
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 27 17:26:06 2024 +0100

    config: wscons: fix warning on discarded const
    
    Fix warning:
    
    ../config/wscons.c:47:11: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
       47 |  { KB_UK, "gb" }, \
          |           ^~~~
    ../config/wscons.c:58:5: note: in expansion of macro ‘KB_OVRENC’
       58 |     KB_OVRENC,
          |     ^~~~~~~~~
    ../config/wscons.c:48:11: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
       48 |  { KB_SV, "se" }, \
          |           ^~~~
    [...]
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1444>

diff --git a/config/wscons.c b/config/wscons.c
index d55ec350f..a7beb85a4 100644
--- a/config/wscons.c
+++ b/config/wscons.c
@@ -53,7 +53,7 @@
 
 struct nameint {
     int val;
-    char *name;
+    const char *name;
 } kbdenc[] = {
     KB_OVRENC,
     KB_ENCTAB