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

This reverts commit a2f72755a904e19e9b28b50b5e604803c4dab40b.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058>
---
 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, 2 insertions(+), 16 deletions(-)
 delete mode 100644 dix/cursor_priv.h

diff --git a/Xi/xichangecursor.c b/Xi/xichangecursor.c
index a0ed7adf7..7059a70d8 100644
--- a/Xi/xichangecursor.c
+++ b/Xi/xichangecursor.c
@@ -36,7 +36,6 @@
 #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
deleted file mode 100644
index bd685dbe1..000000000
--- a/dix/cursor_priv.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* 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 f0ce065df..309b67a0c 100644
--- a/dix/globals.c
+++ b/dix/globals.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 "misc.h"
diff --git a/dix/main.c b/dix/main.c
index 0c57ba605..040dfd225 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -86,7 +86,6 @@ Equipment Corporation.
 
 #include "config/hotplug_priv.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 6b7fc808e..bc516b194 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -99,7 +99,6 @@ Equipment Corporation.
 #include <dix-config.h>
 
 #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 af3529bac..31bd5d20e 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -67,6 +67,8 @@ 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);