From a2f72755a904e19e9b28b50b5e604803c4dab40b Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 29 Feb 2024 10:20:49 +0100
Subject: [PATCH] dix: unexport rootCursor

This field is only used by DIX and XI, 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/xichangecursor.c |  1 +
 dix/cursor_priv.h   | 12 ++++++++++++
 dix/globals.c       |  1 +
 dix/main.c          |  1 +
 dix/window.c        |  1 +
 include/cursor.h    |  2 --
 6 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 dix/cursor_priv.h

diff --git a/Xi/xichangecursor.c b/Xi/xichangecursor.c
index 9f2a616d9..3638f9e20 100644
--- a/Xi/xichangecursor.c
+++ b/Xi/xichangecursor.c
@@ -38,6 +38,7 @@
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XI2proto.h>
 
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
new file mode 100644
index 000000000..bd685dbe1
--- /dev/null
+++ b/dix/cursor_priv.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_DIX_CURSOR_PRIV_H
+#define _XSERVER_DIX_CURSOR_PRIV_H
+
+#include "include/cursor.h"
+
+extern CursorPtr rootCursor;
+
+#endif /* _XSERVER_DIX_CURSOR_PRIV_H */
diff --git a/dix/globals.c b/dix/globals.c
index 65edfc11f..86312b9ee 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -51,6 +51,7 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 
 #include "misc.h"
diff --git a/dix/main.c b/dix/main.c
index 7a6e338c5..65ce34aa2 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -87,6 +87,7 @@ Equipment Corporation.
 #include <X11/fonts/libxfont2.h>
 
 #include "dix/callback_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/dix/window.c b/dix/window.c
index 1bb9cb090..21e09631b 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -101,6 +101,7 @@ Equipment Corporation.
 #endif
 
 #include "dix/colormap_priv.h"
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
diff --git a/include/cursor.h b/include/cursor.h
index 31bd5d20e..af3529bac 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -67,8 +67,6 @@ typedef struct _Cursor *CursorPtr;
 typedef struct _Cursor const *ConstCursorPtr;
 typedef struct _CursorMetric *CursorMetricPtr;
 
-extern _X_EXPORT CursorPtr rootCursor;
-
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);