From af86c5cbc2475b410a2edeb0482ac58309296adb Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 26 Feb 2025 16:27:34 +0100
Subject: [PATCH] Xnest: use authorative declarations from X11/XKBlib.h

Better use the headers from the library we're linking against,
instead of having our own private declarations.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1842>
---
 hw/xnest/Keyboard.c | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index cd6e69b0b..92fedfb74 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -36,28 +36,12 @@ is" without express or implied warranty.
 #include "Args.h"
 #include "Events.h"
 
+// must come after Xnest.h, because of trickery to avoid name clash
+#include <X11/XKBlib.h>
 #include <X11/extensions/XKB.h>
+
 #include "xkbsrv.h"
 
-extern Bool
- XkbQueryExtension(Display * /* dpy */ ,
-                   int * /* opcodeReturn */ ,
-                   int * /* eventBaseReturn */ ,
-                   int * /* errorBaseReturn */ ,
-                   int * /* majorRtrn */ ,
-                   int *        /* minorRtrn */
-    );
-
-extern XkbDescPtr XkbGetKeyboard(Display * /* dpy */ ,
-                                 unsigned int /* which */ ,
-                                 unsigned int   /* deviceSpec */
-    );
-
-extern Status XkbGetControls(Display * /* dpy */ ,
-                             unsigned long /* which */ ,
-                             XkbDescPtr /* desc */
-    );
-
 DeviceIntPtr xnestKeyboardDevice = NULL;
 
 void