From 1b656b5c58604e6779de68d7f3852974e8792ed0 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 28 Jun 2024 11:03:35 +0200
Subject: [PATCH] (submit/colormap.h) dix: unexport FreeColormap()

Not used by any driver/module, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/colormap_priv.h | 5 +++++
 dix/resource.c      | 1 +
 include/colormap.h  | 3 ---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dix/colormap_priv.h b/dix/colormap_priv.h
index 55054ea0f..3bcb889b6 100644
--- a/dix/colormap_priv.h
+++ b/dix/colormap_priv.h
@@ -5,6 +5,8 @@
 #ifndef _XSERVER_DIX_COLORMAP_PRIV_H
 #define _XSERVER_DIX_COLORMAP_PRIV_H
 
+#include <X11/Xdefs.h>
+
 #include "dix/screenint_priv.h"
 #include "include/colormap.h"
 
@@ -13,4 +15,7 @@ typedef struct _CMEntry *EntryPtr;
 int CreateColormap(Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
                    ColormapPtr *ppcmap, int alloc, int client);
 
+/* should only be called via resource type's destructor */
+int FreeColormap(void *pmap, XID mid);
+
 #endif /* _XSERVER_DIX_COLORMAP_PRIV_H */
diff --git a/dix/resource.c b/dix/resource.c
index 87936886b..356483bac 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -123,6 +123,7 @@ Equipment Corporation.
 
 #include <X11/X.h>
 
+#include "dix/colormap_priv.h"
 #include "dix/gc_priv.h"
 #include "dix/registry_priv.h"
 #include "os/osdep.h"
diff --git a/include/colormap.h b/include/colormap.h
index a63d31a57..dc558a23e 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -74,9 +74,6 @@ typedef CARD32 Pixel;
 /* moved to screenint.h: typedef struct _ColormapRec *ColormapPtr */
 typedef struct _colorResource *colorResourcePtr;
 
-extern _X_EXPORT int FreeColormap(void *pmap,
-                                  XID mid);
-
 extern _X_EXPORT int TellLostMap(WindowPtr pwin,
                                  void *value);