From 15af9d3057314ac0e272f5d1735c70017d41ef3a Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 28 Jun 2024 12:24:07 +0200 Subject: [PATCH] (submit/colormap.h) dix: unexport StoreColors() Not used by any driver/module, so no need to keep it exported. Signed-off-by: Enrico Weigelt, metux IT consult --- dix/colormap_priv.h | 2 ++ include/colormap.h | 5 ----- miext/rootless/rootlessScreen.c | 12 +++++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dix/colormap_priv.h b/dix/colormap_priv.h index 73b58b5e4..2aacd6b6f 100644 --- a/dix/colormap_priv.h +++ b/dix/colormap_priv.h @@ -49,4 +49,6 @@ int AllocColorPlanes(int client, ColormapPtr pmap, int colors, int r, int g, int FreeColors(ColormapPtr pmap, int client, int count, Pixel *pixels, Pixel mask); +int StoreColors(ColormapPtr pmap, int count, xColorItem * defs, ClientPtr client); + #endif /* _XSERVER_DIX_COLORMAP_PRIV_H */ diff --git a/include/colormap.h b/include/colormap.h index 33b40a1d7..1cf601ec1 100644 --- a/include/colormap.h +++ b/include/colormap.h @@ -74,11 +74,6 @@ typedef CARD32 Pixel; /* moved to screenint.h: typedef struct _ColormapRec *ColormapPtr */ typedef struct _colorResource *colorResourcePtr; -extern _X_EXPORT int StoreColors(ColormapPtr /*pmap */ , - int /*count */ , - xColorItem * /*defs */ , - ClientPtr client); - extern _X_EXPORT int IsMapInstalled(Colormap /*map */ , WindowPtr /*pWin */ ); diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 79fe3507b..5d9c3e597 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -33,6 +33,13 @@ #include #endif +#include +#include +#include +#include + +#include "dix/colormap_priv.h" + #include "mi.h" #include "scrnintstr.h" #include "gcstruct.h" @@ -43,11 +50,6 @@ #include "picturestr.h" #include "colormapst.h" -#include -#include -#include -#include - #include "rootlessCommon.h" #include "rootlessWindow.h"