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

This reverts commit 24f3c4a508fa5a759fed20449a5f4b848badfbb5.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058>
---
 dix/cursor_priv.h | 34 ----------------------------------
 dix/dispatch.c    |  1 -
 include/cursor.h  | 30 ++++++++++++++++++++++++++++++
 render/render.c   |  4 ++--
 4 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index d5e38d549..89cb59198 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -5,11 +5,7 @@
 #ifndef _XSERVER_DIX_CURSOR_PRIV_H
 #define _XSERVER_DIX_CURSOR_PRIV_H
 
-#include <X11/X.h>
-#include <X11/Xmd.h>
-
 #include "include/cursor.h"
-#include "include/dix.h"
 
 extern CursorPtr rootCursor;
 
@@ -18,34 +14,4 @@ CursorPtr RefCursor(CursorPtr cursor);
 CursorPtr UnrefCursor(CursorPtr cursor);
 int CursorRefCount(ConstCursorPtr cursor);
 
-int AllocARGBCursor(unsigned char *psrcbits,
-                    unsigned char *pmaskbits,
-                    CARD32 *argb,
-                    CursorMetricPtr cm,
-                    unsigned foreRed,
-                    unsigned foreGreen,
-                    unsigned foreBlue,
-                    unsigned backRed,
-                    unsigned backGreen,
-                    unsigned backBlue,
-                    CursorPtr *ppCurs,
-                    ClientPtr client,
-                    XID cid);
-
-int AllocGlyphCursor(Font source,
-                     unsigned int sourceChar,
-                     Font mask,
-                     unsigned int maskChar,
-                     unsigned foreRed,
-                     unsigned foreGreen,
-                     unsigned foreBlue,
-                     unsigned backRed,
-                     unsigned backGreen,
-                     unsigned backBlue,
-                     CursorPtr *ppCurs,
-                     ClientPtr client,
-                     XID cid);
-
-CursorPtr CreateRootCursor(void);
-
 #endif /* _XSERVER_DIX_CURSOR_PRIV_H */
diff --git a/dix/dispatch.c b/dix/dispatch.c
index efb6818df..462b26516 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -104,7 +104,6 @@ Equipment Corporation.
 #include <X11/fonts/libxfont2.h>
 
 #include "dix/colormap_priv.h"
-#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
 #include "dix/gc_priv.h"
diff --git a/include/cursor.h b/include/cursor.h
index bcd98114c..9c7169ec8 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -70,6 +70,36 @@ typedef struct _CursorMetric *CursorMetricPtr;
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);
 
+extern _X_EXPORT int AllocARGBCursor(unsigned char * /*psrcbits */ ,
+                                     unsigned char * /*pmaskbits */ ,
+                                     CARD32 * /*argb */ ,
+                                     CursorMetricPtr /*cm */ ,
+                                     unsigned /*foreRed */ ,
+                                     unsigned /*foreGreen */ ,
+                                     unsigned /*foreBlue */ ,
+                                     unsigned /*backRed */ ,
+                                     unsigned /*backGreen */ ,
+                                     unsigned /*backBlue */ ,
+                                     CursorPtr * /*ppCurs */ ,
+                                     ClientPtr /*client */ ,
+                                     XID /*cid */ );
+
+extern _X_EXPORT int AllocGlyphCursor(Font /*source */ ,
+                                      unsigned int /*sourceChar */ ,
+                                      Font /*mask */ ,
+                                      unsigned int /*maskChar */ ,
+                                      unsigned /*foreRed */ ,
+                                      unsigned /*foreGreen */ ,
+                                      unsigned /*foreBlue */ ,
+                                      unsigned /*backRed */ ,
+                                      unsigned /*backGreen */ ,
+                                      unsigned /*backBlue */ ,
+                                      CursorPtr * /*ppCurs */ ,
+                                      ClientPtr /*client */ ,
+                                      XID /*cid */ );
+
+extern _X_EXPORT CursorPtr CreateRootCursor(void);
+
 extern _X_EXPORT int ServerBitsFromGlyph(FontPtr /*pfont */ ,
                                          unsigned int /*ch */ ,
                                          CursorMetricPtr /*cm */ ,
diff --git a/render/render.c b/render/render.c
index 6386c1962..2eeb756ce 100644
--- a/render/render.c
+++ b/render/render.c
@@ -24,14 +24,12 @@
 
 #include <dix-config.h>
 
-#include <stdint.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/render.h>
 #include <X11/extensions/renderproto.h>
 #include <X11/Xfuncproto.h>
 
-#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "os/osdep.h"
 
@@ -57,6 +55,8 @@
 #include "panoramiXsrv.h"
 #endif /* XINERAMA */
 
+#include <stdint.h>
+
 static int ProcRenderQueryVersion(ClientPtr pClient);
 static int ProcRenderQueryPictFormats(ClientPtr pClient);
 static int ProcRenderQueryPictIndexValues(ClientPtr pClient);