From 711fdc51f1fbd225f66ec558a65df0daf1a5c266 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue, 17 Jun 2025 14:36:09 -0700
Subject: [PATCH] Revert "xfree86: common: move private defs from xf86Xinput.h
 to xf86Xinput_priv.h"

This reverts commit df33e1c51bde33d69886e5cc02e866a34fdeb6c4.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2027>
---
 hw/xfree86/common/xf86Config.c               |  1 -
 hw/xfree86/common/xf86Events.c               |  2 +-
 hw/xfree86/common/xf86Helper.c               |  2 +-
 hw/xfree86/common/xf86PM.c                   |  2 +-
 hw/xfree86/common/xf86Xinput.c               |  2 +-
 hw/xfree86/common/xf86Xinput.h               |  7 +++++++
 hw/xfree86/common/xf86Xinput_priv.h          | 15 ---------------
 hw/xfree86/os-support/linux/systemd-logind.c |  2 +-
 8 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 hw/xfree86/common/xf86Xinput_priv.h

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index e26399cc7..7bb067073 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -65,7 +65,6 @@
 #include "xf86pciBus.h"
 #include "xf86Xinput.h"
 #include "loaderProcs.h"
-#include "xf86Xinput_priv.h"
 
 #include "xkbsrv.h"
 #include "picture.h"
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 6d275267d..2a595b6e3 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -77,7 +77,7 @@
 #endif
 
 #include "inputstr.h"
-#include "xf86Xinput_priv.h"
+#include "xf86Xinput.h"
 #include "mipointer.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 3fd272082..d12fd3961 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -57,7 +57,7 @@
 #include "xf86_OSlib.h"
 #include "micmap.h"
 #include "xf86DDC.h"
-#include "xf86Xinput_priv.h"
+#include "xf86Xinput.h"
 #include "xf86InPriv.h"
 #include "xf86Config.h"
 #include "mivalidate.h"
diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c
index 427e9e0aa..ed7bdbd9f 100644
--- a/hw/xfree86/common/xf86PM.c
+++ b/hw/xfree86/common/xf86PM.c
@@ -32,7 +32,7 @@
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "xf86Xinput_priv.h"
+#include "xf86Xinput.h"
 #include "xf86_OSproc.h"
 
 int (*xf86PMGetEventFromOs) (int fd, pmEvent * events, int num) = NULL;
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index c2bf01968..d0f9db52e 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -64,7 +64,7 @@
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Config.h"
-#include "xf86Xinput_priv.h"
+#include "xf86Xinput.h"
 #include "XIstubs.h"
 #include "xf86Optrec.h"
 #include "mipointer.h"
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index 7d3d5e048..839a3b969 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -114,6 +114,9 @@ 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,
@@ -187,6 +190,10 @@ 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);
diff --git a/hw/xfree86/common/xf86Xinput_priv.h b/hw/xfree86/common/xf86Xinput_priv.h
deleted file mode 100644
index b6fc9836a..000000000
--- a/hw/xfree86/common/xf86Xinput_priv.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 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 */
diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c
index 97f8902e9..689cb1b21 100644
--- a/hw/xfree86/os-support/linux/systemd-logind.c
+++ b/hw/xfree86/os-support/linux/systemd-logind.c
@@ -39,7 +39,7 @@
 #include "linux.h"
 #include "xf86.h"
 #include "xf86platformBus.h"
-#include "xf86Xinput_priv.h"
+#include "xf86Xinput.h"
 #include "xf86Priv.h"
 #include "globals.h"