xfree86: common: move private defs from xf86Xinput.h to xf86Xinput_priv.h

public server module API headers shouldn't be clobbered with non-exported
definitions, so move them out to private header file.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

hw/xfree86/common/xf86Config.c

@@ -62,6 +62,7 @@
 #include "xf86pciBus.h"
 #include "xf86Xinput.h"
 #include "loaderProcs.h"
+#include "xf86Xinput_priv.h"
 
 #include "xkbsrv.h"
 #include "picture.h"

hw/xfree86/common/xf86Events.c

@@ -71,7 +71,7 @@
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "inputstr.h"
-#include "xf86Xinput.h"
+#include "xf86Xinput_priv.h"
 
 #include "mi.h"
 #include "mipointer.h"

hw/xfree86/common/xf86Helper.c

@@ -52,7 +52,7 @@
 #include "xf86_OSlib.h"
 #include "micmap.h"
 #include "xf86DDC.h"
-#include "xf86Xinput.h"
+#include "xf86Xinput_priv.h"
 #include "xf86InPriv.h"
 #include "mivalidate.h"
 

hw/xfree86/common/xf86PM.c

@@ -32,7 +32,7 @@
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "xf86Xinput.h"
+#include "xf86Xinput_priv.h"
 #include "xf86_OSproc.h"
 
 int (*xf86PMGetEventFromOs) (int fd, pmEvent * events, int num) = NULL;

hw/xfree86/common/xf86Xinput.c

@@ -58,7 +58,7 @@
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Config.h"
-#include "xf86Xinput.h"
+#include "xf86Xinput_priv.h"
 #include "xf86Optrec.h"
 #include "mipointer.h"
 #include "extinit.h"

hw/xfree86/common/xf86Xinput.h

@@ -113,9 +113,6 @@ struct _InputInfoRec {
     InputAttributes *attrs;
 };
 
-/* xf86Globals.c */
-extern InputInfoPtr xf86InputDevs;
-
 /* xf86Xinput.c */
 extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute,
                                           int first_valuator, int num_valuators,
@@ -189,10 +186,6 @@ extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
 extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);
 extern _X_EXPORT void xf86InputEnableVTProbe(void);
 
-/* not exported */
-int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
-InputInfoPtr xf86AllocateInput(void);
-
 /* xf86Helper.c */
 extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, void *module,
                                          int flags);

hw/xfree86/common/xf86Xinput_priv.h

@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER__XF86XINPUT_H
+#define _XSERVER__XF86XINPUT_H
+
+#include "xf86Xinput.h"
+
+extern InputInfoPtr xf86InputDevs;
+
+int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
+InputInfoPtr xf86AllocateInput(void);
+
+#endif /* _XSERVER__XF86XINPUT_H */

hw/xfree86/os-support/linux/systemd-logind.c

@@ -37,7 +37,7 @@
 #include "linux.h"
 #include "xf86.h"
 #include "xf86platformBus_priv.h"
-#include "xf86Xinput.h"
+#include "xf86Xinput_priv.h"
 #include "xf86Priv.h"
 #include "globals.h"
 

hw/xfree86/os-support/xf86OSpriv.h

@@ -39,6 +39,9 @@ typedef struct {
 void xf86OSInitVidMem(VidMemInfoPtr);
 
 #ifdef XSERVER_PLATFORM_BUS
+
+struct OdevAttributes;
+
 #include "hotplug.h"
 void
 xf86PlatformDeviceProbe(struct OdevAttributes *attribs);