From 946ff9eac60e6d5b78c87a4c22736c2d52899bd3 Mon Sep 17 00:00:00 2001 From: Aaron Plattner Date: Tue, 24 Jun 2025 10:39:43 -0700 Subject: [PATCH] Revert "mi: unexport miExpandDirectColors()" libwfb.so has a reference to this function: $ nm -D ./build.debug/hw/xfree86/dixmods/libwfb.so | grep miExpandDirectColors U miExpandDirectColors This reverts commit c3c538784a5a0399a5cf0ad98bc51613d55ea918. Signed-off-by: Aaron Plattner --- fb/fbcmap_mi.c | 1 - mi/mi_priv.h | 3 --- mi/micmap.h | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c index 4fd96e6c0..d9447e095 100644 --- a/fb/fbcmap_mi.c +++ b/fb/fbcmap_mi.c @@ -32,7 +32,6 @@ #include #include "dix/colormap_priv.h" -#include "mi/mi_priv.h" #include "fb.h" #include "micmap.h" diff --git a/mi/mi_priv.h b/mi/mi_priv.h index 94644ccdc..87aa1c3a1 100644 --- a/mi/mi_priv.h +++ b/mi/mi_priv.h @@ -6,7 +6,6 @@ #define _XSERVER_MI_PRIV_H #include -#include #include #include "dix/screenint_priv.h" @@ -74,6 +73,4 @@ void miMarkUnrealizedWindow(WindowPtr pChild, WindowPtr pWin, Bool fromConfigure WindowPtr miSpriteTrace(SpritePtr pSprite, int x, int y); WindowPtr miXYToWindow(ScreenPtr pScreen, SpritePtr pSprite, int x, int y); -int miExpandDirectColors(ColormapPtr, int, xColorItem *, xColorItem *); - #endif /* _XSERVER_MI_PRIV_H */ diff --git a/mi/micmap.h b/mi/micmap.h index eeb70c4ae..d8bf7e2c2 100644 --- a/mi/micmap.h +++ b/mi/micmap.h @@ -23,6 +23,8 @@ extern _X_EXPORT void miUninstallColormap(ColormapPtr pmap); extern _X_EXPORT void miResolveColor(unsigned short *, unsigned short *, unsigned short *, VisualPtr); extern _X_EXPORT Bool miInitializeColormap(ColormapPtr); +extern _X_EXPORT int miExpandDirectColors(ColormapPtr, int, xColorItem *, + xColorItem *); extern _X_EXPORT Bool miCreateDefColormap(ScreenPtr); extern _X_EXPORT void miClearVisualTypes(void); extern _X_EXPORT Bool miSetVisualTypes(int, int, int, int);