From 3d05f2b8a87116e7541c371bdd2322b51d9ed82c Mon Sep 17 00:00:00 2001 From: Aaron Plattner Date: Tue, 24 Jun 2025 10:47:31 -0700 Subject: [PATCH] Revert "dix: unexport AllocColor()" libwfb.so has a reference to this function: $ nm -D ./build.debug/hw/xfree86/dixmods/libwfb.so | grep AllocColor U AllocColor This reverts commit b48e4a9cb71c0857d296956c420d50a1330c93e9. Signed-off-by: Aaron Plattner --- dix/colormap_priv.h | 3 --- fb/fbcmap_mi.c | 3 --- include/colormap.h | 7 +++++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dix/colormap_priv.h b/dix/colormap_priv.h index 04a55b07a..266e44793 100644 --- a/dix/colormap_priv.h +++ b/dix/colormap_priv.h @@ -33,9 +33,6 @@ int TellGainedMap(WindowPtr pwin, void *value); int CopyColormapAndFree(Colormap mid, ColormapPtr pSrc, int client); -int AllocColor(ColormapPtr pmap, unsigned short *pred, unsigned short *pgreen, - unsigned short *pblue, Pixel *pPix, int client ); - void FakeAllocColor(ColormapPtr pmap, xColorItem *item); void FakeFreeColor(ColormapPtr pmap, Pixel pixel); diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c index d9447e095..df0fe98b5 100644 --- a/fb/fbcmap_mi.c +++ b/fb/fbcmap_mi.c @@ -30,9 +30,6 @@ #include #include - -#include "dix/colormap_priv.h" - #include "fb.h" #include "micmap.h" diff --git a/include/colormap.h b/include/colormap.h index 216a4c932..e8da083ab 100644 --- a/include/colormap.h +++ b/include/colormap.h @@ -55,6 +55,13 @@ SOFTWARE. typedef CARD32 Pixel; +extern _X_EXPORT int AllocColor(ColormapPtr /*pmap */ , + unsigned short * /*pred */ , + unsigned short * /*pgreen */ , + unsigned short * /*pblue */ , + Pixel * /*pPix */ , + int /*client */ ); + extern _X_EXPORT Bool ResizeVisualArray(ScreenPtr /* pScreen */ , int /* new_vis_count */ , DepthPtr /* depth */ );