xserver: Branch 'master'

[GitLab Mirror]

 xkb/xkbtext_priv.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5268fbd7cffabc2fd7cf6b1ca6515378d55ee0ff
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Nov 10 12:04:33 2024 -0800

    xkbtext_priv.h: fix typo in header guard definition
    
    Found by clang 13.0.1:
    
    ../xkb/xkbtext_priv.h:5:9: warning: '_XSERVER_XKB_XKBTEXT_PRIV_H' is used
     as a header guard here, followed by #define of a different macro
     [-Wheader-guard]
    #ifndef _XSERVER_XKB_XKBTEXT_PRIV_H
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~
    ../xkb/xkbtext_priv.h:6:9: note: '_XSERVER_XKB_XKBTEXt_PRIV_H' is defined
     here; did you mean '_XSERVER_XKB_XKBTEXT_PRIV_H'?
    #define _XSERVER_XKB_XKBTEXt_PRIV_H
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~
            _XSERVER_XKB_XKBTEXT_PRIV_H
    
    Fixes: 434044cb0 ("xkb: unexport functions from xkbtext.c")
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1740>

diff --git a/xkb/xkbtext_priv.h b/xkb/xkbtext_priv.h
index a76283784..0841002a4 100644
--- a/xkb/xkbtext_priv.h
+++ b/xkb/xkbtext_priv.h
@@ -3,7 +3,7 @@
  * Copyright © 2024 Enrico Weigelt, metux IT consult <info at metux.net>
  */
 #ifndef _XSERVER_XKB_XKBTEXT_PRIV_H
-#define _XSERVER_XKB_XKBTEXt_PRIV_H
+#define _XSERVER_XKB_XKBTEXT_PRIV_H
 
 #include <X11/X.h>