xserver: Branch 'master'

[GitLab Mirror]

 include/xkbfile.h |    6 ------
 xkb/xkmread.c     |    2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 8a2590e5d394cea905a65e65cf204be70e694cb5
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Apr 5 15:17:28 2024 +0200

    xkb: make XkbInternAtom() static
    
    It's only used in the same .c file, so make it static.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1506>

diff --git a/include/xkbfile.h b/include/xkbfile.h
index 2bd43683a..334f9a7eb 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -178,12 +178,6 @@ extern _X_EXPORT int XkbFindKeycodeByName(XkbDescPtr /* xkb */ ,
 
 /***====================================================================***/
 
-extern _X_EXPORT Atom XkbInternAtom(char * /* name */ ,
-                                    Bool        /* onlyIfExists */
-    );
-
-/***====================================================================***/
-
 #ifdef _XKBGEOM_H_
 
 #define	XkbDW_Unknown	0
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 007c764cb..def60def8 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -43,7 +43,7 @@
 #include "xkbsrv.h"
 #include "xkbgeom.h"
 
-Atom
+static Atom
 XkbInternAtom(char *str, Bool only_if_exists)
 {
     if (str == NULL)