From 140b75298a46836102a1617855742f53fbe73751 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 8 Feb 2024 17:30:50 +0100
Subject: [PATCH] include: colormap.h: move internal typedef to
 dix/colormap_priv.h

Moving the internal EntryType typedef from "colormap.h" into newly added
internal-only header "dix/colormap_priv.h"

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1283>
---
 dix/colormap.c               |  3 +++
 dix/colormap_priv.h          | 10 ++++++++++
 hw/xfree86/common/xf86cmap.c |  2 ++
 include/colormap.h           |  1 -
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 dix/colormap_priv.h

diff --git a/dix/colormap.c b/dix/colormap.c
index 4276973b6..ec787349f 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -53,6 +53,9 @@ SOFTWARE.
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
+
+#include "dix/colormap_priv.h"
+
 #include "misc.h"
 #include "dix.h"
 #include "dixstruct.h"
diff --git a/dix/colormap_priv.h b/dix/colormap_priv.h
new file mode 100644
index 000000000..9f3d211a3
--- /dev/null
+++ b/dix/colormap_priv.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_DIX_COLORMAP_PRIV_H
+#define _XSERVER_DIX_COLORMAP_PRIv_H
+
+typedef struct _CMEntry *EntryPtr;
+
+#endif /* _XSERVER_DIX_COLORMAP_PRIV_H */
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 152b5821a..bb639c4f8 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -40,6 +40,8 @@
 #include <X11/X.h>
 #include "misc.h"
 #include <X11/Xproto.h>
+
+#include "dix/colormap_priv.h"
 #include "colormapst.h"
 #include "scrnintstr.h"
 
diff --git a/include/colormap.h b/include/colormap.h
index f3b18a613..dabfbd92c 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -70,7 +70,6 @@ SOFTWARE.
 #define BeingCreated 4
 
 typedef CARD32 Pixel;
-typedef struct _CMEntry *EntryPtr;
 
 /* moved to screenint.h: typedef struct _ColormapRec *ColormapPtr */
 typedef struct _colorResource *colorResourcePtr;