From 44c2e088774c269a969ee0c9fc826ff87365987a Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 22 Apr 2024 18:56:53 +0200
Subject: [PATCH] mi: unexport miPointerInitialize()

It's not used by any drivers/modules, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1505>
---
 hw/kdrive/ephyr/ephyrcursor.c |  8 ++++++--
 hw/xwayland/xwayland-cursor.c |  2 ++
 mi/mipointer.c                |  1 +
 mi/mipointer.h                |  8 --------
 mi/mipointer_priv.h           | 16 ++++++++++++++++
 mi/misprite.c                 |  1 +
 6 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 mi/mipointer_priv.h

diff --git a/hw/kdrive/ephyr/ephyrcursor.c b/hw/kdrive/ephyr/ephyrcursor.c
index 9438b2ba3..ac7a245f2 100644
--- a/hw/kdrive/ephyr/ephyrcursor.c
+++ b/hw/kdrive/ephyr/ephyrcursor.c
@@ -25,12 +25,16 @@
  */
 
 #include <dix-config.h>
+
+#include <xcb/render.h>
+#include <xcb/xcb_renderutil.h>
+
+#include "mi/mipointer_priv.h"
+
 #include "ephyr.h"
 #include "ephyrlog.h"
 #include "hostx.h"
 #include "cursorstr.h"
-#include <xcb/render.h>
-#include <xcb/xcb_renderutil.h>
 
 static DevPrivateKeyRec ephyrCursorPrivateKey;
 
diff --git a/hw/xwayland/xwayland-cursor.c b/hw/xwayland/xwayland-cursor.c
index fa77f6daa..be78f97e3 100644
--- a/hw/xwayland/xwayland-cursor.c
+++ b/hw/xwayland/xwayland-cursor.c
@@ -26,6 +26,8 @@
 
 #include <xwayland-config.h>
 
+#include "mi/mipointer_priv.h"
+
 #include "scrnintstr.h"
 #include "servermd.h"
 #include "cursorstr.h"
diff --git a/mi/mipointer.c b/mi/mipointer.c
index b4bf128bd..6011da475 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -55,6 +55,7 @@ in this Software without prior written authorization from The Open Group.
 #include   "dix/cursor_priv.h"
 #include   "dix/dix_priv.h"
 #include   "dix/input_priv.h"
+#include   "mi/mipointer_priv.h"
 
 #include   "misc.h"
 #include   "windowstr.h"
diff --git a/mi/mipointer.h b/mi/mipointer.h
index 00f523740..412694edd 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -77,14 +77,6 @@ extern _X_EXPORT Bool miDCInitialize(ScreenPtr /*pScreen */ ,
                                      miPointerScreenFuncPtr     /*screenFuncs */
     );
 
-extern _X_EXPORT Bool miPointerInitialize(ScreenPtr /*pScreen */ ,
-                                          miPointerSpriteFuncPtr
-                                          /*spriteFuncs */ ,
-                                          miPointerScreenFuncPtr
-                                          /*screenFuncs */ ,
-                                          Bool  /*waitForUpdate */
-    );
-
 extern _X_EXPORT void miPointerWarpCursor(DeviceIntPtr /*pDev */ ,
                                           ScreenPtr /*pScreen */ ,
                                           int /*x */ ,
diff --git a/mi/mipointer_priv.h b/mi/mipointer_priv.h
new file mode 100644
index 000000000..23bc7f9d9
--- /dev/null
+++ b/mi/mipointer_priv.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_MI_MIPOINTER_PRIV_H
+#define _XSERVER_MI_MIPOINTER_PRIV_H
+
+#include <X11/Xdefs.h>
+
+#include "dix/screenint_priv.h"
+#include "mi/mipointer.h"
+
+Bool miPointerInitialize(ScreenPtr pScreen, miPointerSpriteFuncPtr spriteFuncs,
+                         miPointerScreenFuncPtr screenFuncs, Bool waitForUpdate);
+
+#endif /* _XSERVER_MI_MIPOINTER_PRIV_H */
diff --git a/mi/misprite.c b/mi/misprite.c
index e832daa64..67357a914 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -38,6 +38,7 @@ in this Software without prior written authorization from The Open Group.
 
 #include   "dix/colormap_priv.h"
 #include   "dix/dix_priv.h"
+#include   "mi/mipointer_priv.h"
 
 #include   "misc.h"
 #include   "pixmapstr.h"