(submit/colormap.h) dix: unexport CreateColormap()

Not used by any driver/module, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

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 */

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/gc_priv.h"
 #include "dix/registry_priv.h"

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"

hw/xnest/Color.c

@@ -17,6 +17,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"

hw/xwin/wincmap.c

@@ -36,6 +36,8 @@
 #endif
 #include "win.h"
 
+#include "dix/colormap_priv.h"
+
 /*
  * Local prototypes
  */

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);
 

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"

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"