xserver: Branch 'master'

[GitLab Mirror]

 Xi/XIstubs.h                   |   29 +++++++++++++----------------
 hw/xfree86/common/xf86Xinput.c |    1 +
 hw/xfree86/common/xf86Xinput.h |    1 -
 hw/xfree86/sdksyms.sh          |    1 -
 include/meson.build            |    1 -
 5 files changed, 14 insertions(+), 19 deletions(-)

New commits:
commit 03eb59346046073a63b67cd00d9101a79bbe2ed3
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Feb 26 15:12:20 2024 +0100

    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 at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1325>

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 */ );
-
-extern _X_EXPORT 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 SetDeviceMode(ClientPtr client,
+                  DeviceIntPtr dev,
+                  int mode);
+
+int SetDeviceValuators(ClientPtr client,
+                       DeviceIntPtr dev,
+                       int *valuators,
+                       int first_valuator,
+                       int num_valuators);
+
+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 0d1dd8b6d..2d310cc58 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.h"
+#include "XIstubs.h"
 #include "xf86Optrec.h"
 #include "mipointer.h"
 #include "extinit.h"
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index 6c4eaede1..839a3b969 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 c3ed36401..dd27be400 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -222,7 +222,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 77c761862..773857ad5 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -439,7 +439,6 @@ endif
 if build_xorg
     install_data(
         [
-            'XIstubs.h',
             'Xprintf.h',
             'callback.h',
             'client.h',