From aae9bd3f62ef88f5925c2270c7400314c6c40a6b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 22 Apr 2024 17:18:30 +0200 Subject: [PATCH] mi: unexport SetInstalledmiColormap() macro Not neeed by any drivers/modules, so no need to keep it exported. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- hw/xfree86/common/xf86cmap.c | 4 +++- mi/mi_priv.h | 3 +++ mi/micmap.c | 1 + mi/micmap.h | 2 -- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index ca547cc33..84f6a495d 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -36,9 +36,11 @@ #include "misc.h" #include "dix/colormap_priv.h" +#include "mi/mi_priv.h" + +#include "misc.h" #include "colormapst.h" #include "scrnintstr.h" - #include "resource.h" #include "xf86.h" diff --git a/mi/mi_priv.h b/mi/mi_priv.h index 33256bc09..1264e03b1 100644 --- a/mi/mi_priv.h +++ b/mi/mi_priv.h @@ -20,6 +20,9 @@ #include "include/window.h" #include "mi/mi.h" +#define SetInstalledmiColormap(s,c) \ + (dixSetPrivate(&(s)->devPrivates, micmapScrPrivateKey, c)) + void miScreenClose(ScreenPtr pScreen); void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs); diff --git a/mi/micmap.c b/mi/micmap.c index e3675c301..1259bbba2 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -33,6 +33,7 @@ #include #include "dix/colormap_priv.h" +#include "mi/mi_priv.h" #include "scrnintstr.h" #include "colormapst.h" diff --git a/mi/micmap.h b/mi/micmap.h index 18c06427b..eeb70c4ae 100644 --- a/mi/micmap.h +++ b/mi/micmap.h @@ -6,8 +6,6 @@ #define GetInstalledmiColormap(s) \ ((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, micmapScrPrivateKey)) -#define SetInstalledmiColormap(s,c) \ - (dixSetPrivate(&(s)->devPrivates, micmapScrPrivateKey, c)) extern _X_EXPORT DevPrivateKeyRec micmapScrPrivateKeyRec;