diff options
| -rw-r--r-- | dix/colormap_priv.h | 6 | ||||
| -rw-r--r-- | dix/dispatch.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86DGA.c | 1 | ||||
| -rw-r--r-- | hw/xnest/Color.c | 2 | ||||
| -rw-r--r-- | hw/xwin/wincmap.c | 2 | ||||
| -rw-r--r-- | include/colormap.h | 7 | ||||
| -rw-r--r-- | mi/micmap.c | 3 | ||||
| -rw-r--r-- | render/picture.c | 2 |
8 files changed, 17 insertions, 7 deletions
diff --git a/dix/colormap_priv.h b/dix/colormap_priv.h index dbdffb8d0..55054ea0f 100644 --- a/dix/colormap_priv.h +++ b/dix/colormap_priv.h @@ -5,6 +5,12 @@ #ifndef _XSERVER_DIX_COLORMAP_PRIV_H #define _XSERVER_DIX_COLORMAP_PRIV_H +#include "dix/screenint_priv.h" +#include "include/colormap.h" + typedef struct _CMEntry *EntryPtr; +int CreateColormap(Colormap mid, ScreenPtr pScreen, VisualPtr pVisual, + ColormapPtr *ppcmap, int alloc, int client); + #endif /* _XSERVER_DIX_COLORMAP_PRIV_H */ diff --git a/dix/dispatch.c b/dix/dispatch.c index 0e79f9956..eea2bc105 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -105,6 +105,7 @@ Equipment Corporation. #include <X11/fonts/fontstruct.h> #include <X11/fonts/libxfont2.h> +#include "dix/colormap_priv.h" #include "dix/dix_priv.h" #include "dix/input_priv.h" #include "dix/gc_priv.h" diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 614c35ae4..3ce1f1259 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -46,6 +46,7 @@ #include <X11/Xproto.h> #include <X11/extensions/xf86dgaproto.h> +#include "dix/colormap_priv.h" #include "dix/dix_priv.h" #include "dix/eventconvert.h" #include "dix/exevents_priv.h" diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c index 06b384539..37c960141 100644 --- a/hw/xnest/Color.c +++ b/hw/xnest/Color.c @@ -20,6 +20,8 @@ is" without express or implied warranty. #include <X11/Xdefs.h> #include <X11/Xproto.h> +#include "dix/colormap_priv.h" + #include "scrnintstr.h" #include "window.h" #include "windowstr.h" diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c index df69ba78b..3567afad5 100644 --- a/hw/xwin/wincmap.c +++ b/hw/xwin/wincmap.c @@ -36,6 +36,8 @@ #endif #include "win.h" +#include "dix/colormap_priv.h" + /* * Local prototypes */ diff --git a/include/colormap.h b/include/colormap.h index dabfbd92c..a63d31a57 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 CreateColormap(Colormap /*mid */ , - ScreenPtr /*pScreen */ , - VisualPtr /*pVisual */ , - ColormapPtr * /*ppcmap */ , - int /*alloc */ , - int /*client */ ); - extern _X_EXPORT int FreeColormap(void *pmap, XID mid); diff --git a/mi/micmap.c b/mi/micmap.c index d42a1cc51..2c312845d 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -33,6 +33,9 @@ #include <X11/X.h> #include <X11/Xproto.h> + +#include "dix/colormap_priv.h" + #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/render/picture.c b/render/picture.c index 3c0da91cd..d41a0ed91 100644 --- a/render/picture.c +++ b/render/picture.c @@ -26,6 +26,8 @@ #include <dix-config.h> #endif +#include "dix/colormap_priv.h" + #include "misc.h" #include "scrnintstr.h" #include "os.h" |