xserver: Branch 'master'

[GitLab Mirror]

 include/xkbsrv.h |    7 -------
 xkb/xkbUtils.c   |    2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 95faea8880984c91955d2f6345244a319e40b96c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Apr 3 19:52:03 2024 +0200

    xkb: make XkbUpdateKeyTypesFromCore() static
    
    This function is only used inside the same .c file where it's defined,
    no outside users, also not in drivers. Thus no need to keep it exported.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1468>

diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 21cd8768d..d19946ede 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -460,13 +460,6 @@ extern _X_EXPORT XkbAction *XkbResizeKeyActions(XkbDescPtr /* xkb */ ,
                                                 int     /* needed */
     );
 
-extern _X_EXPORT void XkbUpdateKeyTypesFromCore(DeviceIntPtr /* pXDev */ ,
-                                                KeySymsPtr /* syms */ ,
-                                                KeyCode /* first */ ,
-                                                CARD8 /* num */ ,
-                                                XkbChangesPtr   /* pChanges */
-    );
-
 extern _X_EXPORT void XkbUpdateDescActions(XkbDescPtr /* xkb */ ,
                                            KeyCode /* first */ ,
                                            CARD8 /* num */ ,
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 3da816084..9ad66927c 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -211,7 +211,7 @@ XkbMaskForVMask(XkbDescPtr xkb, unsigned vmask)
 
 /***====================================================================***/
 
-void
+static void
 XkbUpdateKeyTypesFromCore(DeviceIntPtr pXDev,
                           KeySymsPtr pCore,
                           KeyCode first, CARD8 num, XkbChangesPtr changes)