From e99a1b5d9961943a2c7bcaaa2dd71a40125d6070 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 29 Feb 2024 12:31:22 +0100
Subject: [PATCH] (submit/cursor-api) dix: unexport cursor allocation functions

These functions aren't used by external modules, so no need to export them.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/cursor_priv.h | 34 ++++++++++++++++++++++++++++++++++
 dix/dispatch.c    |  1 +
 include/cursor.h  | 30 ------------------------------
 render/render.c   |  4 ++--
 4 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index 3df0d4e50..6e4ccd6e5 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -5,7 +5,11 @@
 #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;
 
@@ -14,4 +18,34 @@ CursorPtr RefCursor(CursorPtr cursor);
 CursorPtr UnrefCursor(CursorPtr cursor);
 int CursorRefCount(const CursorPtr 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 a4a0e67e0..9c5f5fd9f 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -106,6 +106,7 @@ 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 40018e631..3087dd545 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -65,36 +65,6 @@ 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 4c72f0da5..81190e425 100644
--- a/render/render.c
+++ b/render/render.c
@@ -26,12 +26,14 @@
 #include <dix-config.h>
 #endif
 
+#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 "miext/extinit_priv.h"
 
@@ -56,8 +58,6 @@
 #include "panoramiXsrv.h"
 #endif
 
-#include <stdint.h>
-
 Bool noRenderExtension = FALSE;
 
 static int ProcRenderQueryVersion(ClientPtr pClient);