From eb81769b58815719b806208d05d4e91949e41084 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 29 Feb 2024 14:31:05 +0100
Subject: [PATCH] dix: unexport GetSpritePosition()

This function isn't used in any external modules, thus no need to export it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1345>
---
 Xi/exevents.c     | 2 ++
 Xi/xibarriers.c   | 1 +
 dix/cursor_priv.h | 2 ++
 include/cursor.h  | 4 ----
 randr/rrpointer.c | 3 +++
 xkb/xkbActions.c  | 1 +
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 30b1a72dd..2f02d7ed4 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -82,6 +82,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include "dix/cursor_priv.h"
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/geproto.h>
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index 5cccebdf2..0c6f8877e 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -45,6 +45,7 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
 
diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index 82fb01144..58048aea9 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -71,4 +71,6 @@ void NewCurrentScreen(DeviceIntPtr pDev,
 
 Bool PointerConfinedToScreen(DeviceIntPtr pDev);
 
+void GetSpritePosition(DeviceIntPtr pDev, int *px, int *py);
+
 #endif /* _XSERVER_DIX_CURSOR_PRIV_H */
diff --git a/include/cursor.h b/include/cursor.h
index 9186e3bf2..7167f4707 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -70,10 +70,6 @@ typedef struct _CursorMetric *CursorMetricPtr;
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);
 
-extern _X_EXPORT void GetSpritePosition(struct _DeviceIntRec * /* pDev */ ,
-                                        int * /*px */ ,
-                                        int * /*py */ );
-
 #ifdef PANORAMIX
 extern _X_EXPORT int XineramaGetCursorScreen(struct _DeviceIntRec *pDev);
 #endif                          /* PANORAMIX */
diff --git a/randr/rrpointer.c b/randr/rrpointer.c
index b301d050d..bd394530a 100644
--- a/randr/rrpointer.c
+++ b/randr/rrpointer.c
@@ -19,6 +19,9 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
+
+#include "dix/cursor_priv.h"
 
 #include "randrstr.h"
 #include "inputstr.h"
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index bbae03b51..bdfca425f 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -35,6 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
 
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
 #include "xkb/xkbsrv_priv.h"