diff --git a/dix/colormap_priv.h b/dix/colormap_priv.h index c5ea51f3d..6e7dff8aa 100644 --- a/dix/colormap_priv.h +++ b/dix/colormap_priv.h @@ -25,4 +25,7 @@ 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 ); + #endif /* _XSERVER_DIX_COLORMAP_PRIV_H */ diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c index a71828a11..6c826dcab 100644 --- a/fb/fbcmap_mi.c +++ b/fb/fbcmap_mi.c @@ -32,6 +32,9 @@ #endif #include + +#include "dix/colormap_priv.h" + #include "fb.h" #include "micmap.h" diff --git a/include/colormap.h b/include/colormap.h index c24b54b12..5279998f8 100644 --- a/include/colormap.h +++ b/include/colormap.h @@ -74,13 +74,6 @@ typedef CARD32 Pixel; /* moved to screenint.h: typedef struct _ColormapRec *ColormapPtr */ typedef struct _colorResource *colorResourcePtr; -extern _X_EXPORT int AllocColor(ColormapPtr /*pmap */ , - unsigned short * /*pred */ , - unsigned short * /*pgreen */ , - unsigned short * /*pblue */ , - Pixel * /*pPix */ , - int /*client */ ); - extern _X_EXPORT void FakeAllocColor(ColormapPtr /*pmap */ , xColorItem * /*item */ ); diff --git a/render/miindex.c b/render/miindex.c index 4119eef66..7892b66ff 100644 --- a/render/miindex.c +++ b/render/miindex.c @@ -28,6 +28,8 @@ #ifndef _MIINDEX_H_ #define _MIINDEX_H_ +#include "dix/colormap_priv.h" + #include "scrnintstr.h" #include "gcstruct.h" #include "pixmapstr.h"