From d5e35c91dab3dddda520d04a7276bfa5cd5aa119 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 26 Feb 2024 15:12:20 +0100
Subject: [PATCH] (submit/unexport-xistub) include: unexport XIstubs.h

The functions declared here aren't used by any driver, so no need to keep
them in the public driver API. Since the whole file isn't included by anybody
outside the xserver tree itself, it doesn't need to be installed at all,
so making it internal and move it to Xi directory.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 {include => Xi}/XIstubs.h      | 25 +++++++++++--------------
 hw/xfree86/common/xf86Xinput.c |  1 +
 hw/xfree86/common/xf86Xinput.h |  1 -
 hw/xfree86/sdksyms.sh          |  1 -
 include/meson.build            |  1 -
 5 files changed, 12 insertions(+), 17 deletions(-)
 rename {include => Xi}/XIstubs.h (70%)

diff --git a/include/XIstubs.h b/Xi/XIstubs.h
similarity index 70%
rename from include/XIstubs.h
rename to Xi/XIstubs.h
index b7ea4d1f4..25662f3a2 100644
--- a/include/XIstubs.h
+++ b/Xi/XIstubs.h
@@ -26,21 +26,18 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef XI_STUBS_H
 #define XI_STUBS_H 1
 
-extern _X_EXPORT int
- SetDeviceMode(ClientPtr /* client */ ,
-               DeviceIntPtr /* dev */ ,
-               int /* mode */ );
+int SetDeviceMode(ClientPtr client,
+                  DeviceIntPtr dev,
+                  int mode);
 
-extern _X_EXPORT int
- SetDeviceValuators(ClientPtr /* client */ ,
-                    DeviceIntPtr /* dev */ ,
-                    int * /* valuators */ ,
-                    int /* first_valuator */ ,
-                    int /* num_valuators */ );
+int SetDeviceValuators(ClientPtr client,
+                       DeviceIntPtr dev,
+                       int *valuators,
+                       int first_valuator,
+                       int num_valuators);
 
-extern _X_EXPORT int
- ChangeDeviceControl(ClientPtr /* client */ ,
-                     DeviceIntPtr /* dev */ ,
-                     xDeviceCtl * /* control */ );
+int ChangeDeviceControl(ClientPtr client,
+                        DeviceIntPtr dev,
+                        xDeviceCtl *control);
 
 #endif                          /* XI_STUBS_H */
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 3367d959a..0a18ba0e8 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -65,6 +65,7 @@
 #include "xf86Priv.h"
 #include "xf86Config.h"
 #include "xf86Xinput_priv.h"
+#include "XIstubs.h"
 #include "xf86Optrec.h"
 #include "mipointer.h"
 #include "loaderProcs.h"
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index 730cd760d..7d3d5e048 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -58,7 +58,6 @@
 #include "inputstr.h"
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "XIstubs.h"
 
 /* Input device flags */
 #define XI86_ALWAYS_CORE	0x04    /* device always controls the pointer */
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index e8342f760..d38edc432 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -225,7 +225,6 @@ cat > sdksyms.c << EOF
 
 
 /* include/Makefile.am */
-#include "XIstubs.h"
 #include "Xprintf.h"
 #include "closure.h"
 #include "colormap.h"
diff --git a/include/meson.build b/include/meson.build
index d1e27b059..cf5db1aef 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -438,7 +438,6 @@ endif
 if build_xorg
     install_data(
         [
-            'XIstubs.h',
             'Xprintf.h',
             'callback.h',
             'client.h',