From b858cb5ccdb283a64143e9f26850e082b288b18a Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun, 31 Aug 2025 12:29:35 -0700
Subject: [PATCH] Revert "dix: unexport cursor refcounting functions"

This reverts commit 4aadbeb8aad36906dcb43b5faf158a506c672597.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058>
---
 Xext/saver.c                     | 1 -
 dix/cursor.c                     | 1 -
 dix/cursor_priv.h                | 5 -----
 dix/events.c                     | 1 -
 dix/grabs.c                      | 1 -
 hw/xfree86/ramdac/xf86CursorRD.c | 1 -
 include/cursor.h                 | 4 ++++
 render/animcur.c                 | 3 ---
 xfixes/cursor.c                  | 1 -
 9 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Xext/saver.c b/Xext/saver.c
index 1f5f82c35..f82607e7a 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -34,7 +34,6 @@ in this Software without prior written authorization from the X Consortium.
 #include <X11/extensions/saverproto.h>
 
 #include "dix/colormap_priv.h"
-#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "os/osdep.h"
 #include "os/screensaver.h"
diff --git a/dix/cursor.c b/dix/cursor.c
index e3774f7be..6edd1f307 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -49,7 +49,6 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
-#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 
 #include "servermd.h"
diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index 89cb59198..bd685dbe1 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -9,9 +9,4 @@
 
 extern CursorPtr rootCursor;
 
-/* reference counting */
-CursorPtr RefCursor(CursorPtr cursor);
-CursorPtr UnrefCursor(CursorPtr cursor);
-int CursorRefCount(ConstCursorPtr cursor);
-
 #endif /* _XSERVER_DIX_CURSOR_PRIV_H */
diff --git a/dix/events.c b/dix/events.c
index 806664671..9c2f70b32 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -118,7 +118,6 @@ Equipment Corporation.
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
 
-#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/dixgrabs_priv.h"
 #include "dix/input_priv.h"
diff --git a/dix/grabs.c b/dix/grabs.c
index 8409a0bf8..c079c5999 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -51,7 +51,6 @@ SOFTWARE.
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2.h>
 
-#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/dixgrabs_priv.h"
 #include "dix/exevents_priv.h"
diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c
index f6d883f3b..fb4d6b429 100644
--- a/hw/xfree86/ramdac/xf86CursorRD.c
+++ b/hw/xfree86/ramdac/xf86CursorRD.c
@@ -3,7 +3,6 @@
 #include <xorg-config.h>
 #endif
 
-#include "dix/cursor_priv.h"
 #include "mi/mipointer_priv.h"
 
 #include "xf86.h"
diff --git a/include/cursor.h b/include/cursor.h
index 9c7169ec8..af3529bac 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -70,6 +70,10 @@ typedef struct _CursorMetric *CursorMetricPtr;
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);
 
+extern _X_EXPORT CursorPtr RefCursor(CursorPtr /* cursor */);
+extern _X_EXPORT CursorPtr UnrefCursor(CursorPtr /* cursor */);
+extern _X_EXPORT int CursorRefCount(ConstCursorPtr /* cursor */);
+
 extern _X_EXPORT int AllocARGBCursor(unsigned char * /*psrcbits */ ,
                                      unsigned char * /*pmaskbits */ ,
                                      CARD32 * /*argb */ ,
diff --git a/render/animcur.c b/render/animcur.c
index 1194cee7e..47c64dec9 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -35,9 +35,6 @@
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
-
-#include "dix/cursor_priv.h"
-
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "dixstruct.h"
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index a2c4159d1..4c7ca95a1 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -44,7 +44,6 @@
 
 #include <dix-config.h>
 
-#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"