Remove a bunch of unused API from the mi export list.

16 files changed, 21 insertions, 49 deletions

diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c
index 1f9b9a6ad..91f2529b0 100644
--- a/hw/xfree86/loader/misym.c
+++ b/hw/xfree86/loader/misym.c
@@ -84,8 +84,6 @@
 extern miPointerSpriteFuncRec miSpritePointerFuncs;
 
 _X_HIDDEN void *miLookupTab[] = {
-    SYMFUNC(miAllocateGCPrivateIndex)
-    SYMFUNC(miChangeBorderWidth)
     SYMFUNC(miChangeClip)
     SYMFUNC(miChangeGC)
     SYMFUNC(miClearDrawable)
@@ -93,29 +91,19 @@ _X_HIDDEN void *miLookupTab[] = {
     SYMFUNC(miClearVisualTypes)
     SYMFUNC(miClipSpans)
     SYMFUNC(miComputeCompositeClip)
-    SYMFUNC(miCopyArea)
     SYMFUNC(miCopyClip)
     SYMFUNC(miCopyGC)
-    SYMFUNC(miCopyPlane)
     SYMFUNC(miCreateDefColormap)
-    SYMFUNC(miCreateGCOps)
     SYMFUNC(miCreateScreenResources)
     SYMFUNC(miDCInitialize)
     SYMFUNC(miDestroyClip)
     SYMFUNC(miDestroyGC)
-    SYMFUNC(miDestroyGCOps)
     SYMFUNC(miExpandDirectColors)
     SYMFUNC(miFillArcSetup)
     SYMFUNC(miFillArcSliceSetup)
-    SYMFUNC(miFillConvexPoly)
     SYMFUNC(miFillPolygon)
-    SYMFUNC(miFindMaxBand)
     SYMFUNC(miGetDefaultVisualMask)
-    SYMFUNC(miGetImage)
-    SYMFUNC(miGetScreenPixmap)
     SYMFUNC(miHandleExposures)
-    SYMFUNC(miHandleValidateExposures)
-    SYMFUNC(miHookInitVisuals)
     SYMFUNC(miImageGlyphBlt)
     SYMFUNC(miImageText16)
     SYMFUNC(miImageText8)
@@ -128,7 +116,6 @@ _X_HIDDEN void *miLookupTab[] = {
     SYMFUNC(miIntersect)
     SYMFUNC(miInverse)
     SYMFUNC(miListInstalledColormaps)
-    SYMFUNC(miModifyBanking)
     SYMFUNC(miModifyPixmapHeader)
     SYMFUNC(miOverlayCollectUnderlayRegions)
     SYMFUNC(miOverlayComputeCompositeClip)
@@ -136,7 +123,6 @@ _X_HIDDEN void *miLookupTab[] = {
     SYMFUNC(miOverlayGetPrivateClips)
     SYMFUNC(miOverlaySetRootClip)
     SYMFUNC(miOverlaySetTransFunction)
-    SYMFUNC(miPaintWindow)
     SYMFUNC(miPointInRegion)
     SYMFUNC(miPointerAbsoluteCursor)
     SYMFUNC(miPointerCurrentScreen)
@@ -153,9 +139,6 @@ _X_HIDDEN void *miLookupTab[] = {
     SYMFUNC(miPolySegment)
     SYMFUNC(miPolyText16)
     SYMFUNC(miPolyText8)
-    SYMFUNC(miPushPixels)
-    SYMFUNC(miPutImage)
-    SYMFUNC(miRecolorCursor)
     SYMFUNC(miRectAlloc)
     SYMFUNC(miRectIn)
     SYMFUNC(miRectsToRegion)
@@ -176,15 +159,10 @@ _X_HIDDEN void *miLookupTab[] = {
     SYMFUNC(miRoundJoinClip)
     SYMFUNC(miScreenInit)
     SYMFUNC(miSegregateChildren)
-    SYMFUNC(miSendGraphicsExpose)
     SYMFUNC(miSetPixmapDepths)
-    SYMFUNC(miSetScreenPixmap)
-    SYMFUNC(miSetShape)
     SYMFUNC(miSetVisualTypes)
     SYMFUNC(miSetVisualTypesAndMasks)
     SYMFUNC(miSetZeroLineBias)
-    SYMFUNC(miShapedWindowIn)
-    SYMFUNC(miStepDash)
     SYMFUNC(miSubtract)
     SYMFUNC(miTranslateRegion)
     SYMFUNC(miUninstallColormap)
@@ -194,12 +172,10 @@ _X_HIDDEN void *miLookupTab[] = {
     SYMFUNC(miWindowExposures)
     SYMFUNC(miZeroArcSetup)
     SYMFUNC(miZeroClipLine)
-    SYMFUNC(miZeroDashLine)
     SYMFUNC(miZeroLine)
     SYMFUNC(miZeroPolyArc)
     SYMVAR(miEmptyBox)
     SYMVAR(miEmptyData)
-    SYMVAR(miInitVisualsProc)
     SYMVAR(miInstalledMaps)
     SYMVAR(miPointerScreenKey)
     SYMVAR(miSpritePointerFuncs)
diff --git a/mi/mi.h b/mi/mi.h
index 45bfa1d2c..8bacaa7a4 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -423,10 +423,6 @@ extern DevPrivateKey miAllocateGCPrivateIndex(
     void
 );
 
-extern PixmapPtr miGetScreenPixmap(
-    ScreenPtr pScreen
-);
-
 extern void miSetScreenPixmap(
     PixmapPtr pPix
 );
diff --git a/mi/mibank.c b/mi/mibank.c
index 92288abef..32d52fe13 100644
--- a/mi/mibank.c
+++ b/mi/mibank.c
@@ -2217,7 +2217,7 @@ miBankNewSerialNumber(
 }
 
 /* This entry modifies the banking interface */
-_X_EXPORT Bool
+Bool
 miModifyBanking(
     ScreenPtr     pScreen,
     miBankInfoPtr pBankInfo
diff --git a/mi/mibitblt.c b/mi/mibitblt.c
index 168b91564..99375b660 100644
--- a/mi/mibitblt.c
+++ b/mi/mibitblt.c
@@ -73,7 +73,7 @@ extern int ffs(int);
  *     set them in the destination with SetSpans
  * We let SetSpans worry about clipping to the destination.
  */
-_X_EXPORT RegionPtr
+RegionPtr
 miCopyArea(DrawablePtr  pSrcDrawable,
            DrawablePtr  pDstDrawable,
            GCPtr        pGC,
@@ -549,7 +549,7 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc,
  * build a source clip
  * Use the bitmap we've built up as a Stipple for the destination 
  */
-_X_EXPORT RegionPtr
+RegionPtr
 miCopyPlane( DrawablePtr pSrcDrawable,
              DrawablePtr pDstDrawable,
              GCPtr pGC,
diff --git a/mi/micmap.c b/mi/micmap.c
index 33d948179..60dacc315 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -52,7 +52,7 @@ static Bool miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp,
 		int *ndepthp, int *rootDepthp, VisualID *defaultVisp,
 		unsigned long sizes, int bitsPerRGB, int preferredVis);
 
-_X_EXPORT miInitVisualsProcPtr miInitVisualsProc = miDoInitVisuals;
+miInitVisualsProcPtr miInitVisualsProc = miDoInitVisuals;
 
 _X_EXPORT int
 miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
diff --git a/mi/micursor.c b/mi/micursor.c
index 8b1649039..f6ae8f488 100644
--- a/mi/micursor.c
+++ b/mi/micursor.c
@@ -54,7 +54,7 @@ SOFTWARE.
 #include "mi.h"
 #include "inputstr.h"
 
-_X_EXPORT void
+void
 miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr,
                 CursorPtr pCurs, Bool displayed)
 {
diff --git a/mi/midash.c b/mi/midash.c
index 40c741b44..ba64d354f 100644
--- a/mi/midash.c
+++ b/mi/midash.c
@@ -52,7 +52,7 @@ SOFTWARE.
 #include "mistruct.h"
 #include "mifpoly.h"
 
-_X_EXPORT void
+void
 miStepDash (
     int dist,			/* distance to step */
     int *pDashIndex,		/* current dash */
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 9fbcdd737..f8a9e2fe4 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -341,7 +341,7 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
 
 /* send GraphicsExpose events, or a NoExpose event, based on the region */
 
-_X_EXPORT void
+void
 miSendGraphicsExpose (ClientPtr client, RegionPtr pRgn, XID drawable,
                       int major, int minor)
 {
@@ -514,7 +514,7 @@ miWindowExposures( WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed)
 	REGION_DESTROY( pWin->drawable.pScreen, exposures);
 }
 
-_X_EXPORT void
+void
 miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
 {
     ScreenPtr	pScreen = pWin->drawable.pScreen;
diff --git a/mi/migc.c b/mi/migc.c
index 8590d913d..c84665993 100644
--- a/mi/migc.c
+++ b/mi/migc.c
@@ -58,7 +58,7 @@ miDestroyGC(GCPtr pGC)
  * create a private op array for a gc
  */
 
-_X_EXPORT GCOpsPtr
+GCOpsPtr
 miCreateGCOps(GCOpsPtr prototype)
 {
     GCOpsPtr        ret;
@@ -71,7 +71,7 @@ miCreateGCOps(GCOpsPtr prototype)
     return ret;
 }
 
-_X_EXPORT void
+void
 miDestroyGCOps(GCOpsPtr ops)
 {
     if (ops->devPrivate.val)
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 6516f43db..cea89843d 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -584,7 +584,7 @@ InitVisualWrap()
 	(*__miHookInitVisualsFunction)(&miInitVisualsProc);
 }
 
-_X_EXPORT void
+void
 miHookInitVisuals(void (**old)(miInitVisualsProcPtr *),
 		  void (*new)(miInitVisualsProcPtr *))
 {
diff --git a/mi/mipolycon.c b/mi/mipolycon.c
index 085bed3c6..6e3889621 100644
--- a/mi/mipolycon.c
+++ b/mi/mipolycon.c
@@ -71,7 +71,7 @@ static int getPolyYBounds(DDXPointPtr pts, int n, int *by, int *ty);
  *     For a derivation of the algorithm, see the author of
  *     this code.
  */
-_X_EXPORT Bool
+Bool
 miFillConvexPoly(
     DrawablePtr dst,
     GCPtr	pgc,
diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c
index 87ca1445e..4b9789047 100644
--- a/mi/mipushpxl.c
+++ b/mi/mipushpxl.c
@@ -92,7 +92,7 @@ bitsizeof(int) padding and sacnline unit == bitsizeof(int).)
  * in order to have both (MSB_FIRST and LSB_FIRST) versions of this
  * in the server, we need to rename one of them
  */
-_X_EXPORT void
+void
 miPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,
              int dx, int dy, int xOrg, int yOrg)
 {
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index df969939e..2008a6899 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -283,7 +283,7 @@ miScreenInit(
 static int privateKeyIndex;
 static DevPrivateKey privateKey = &privateKeyIndex;
 
-_X_EXPORT DevPrivateKey
+DevPrivateKey
 miAllocateGCPrivateIndex()
 {
     return privateKey;
@@ -298,13 +298,13 @@ miSetZeroLineBias(ScreenPtr pScreen, unsigned int bias)
     dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, (pointer)bias);
 }
 
-_X_EXPORT PixmapPtr
+PixmapPtr
 miGetScreenPixmap(ScreenPtr pScreen)
 {
     return (PixmapPtr)(pScreen->devPrivate);
 }
 
-_X_EXPORT void
+void
 miSetScreenPixmap(PixmapPtr pPix)
 {
     if (pPix)
diff --git a/mi/mivaltree.c b/mi/mivaltree.c
index 92dcffeea..2585422bc 100644
--- a/mi/mivaltree.c
+++ b/mi/mivaltree.c
@@ -106,7 +106,7 @@ Equipment Corporation.
 /*
  * Compute the visibility of a shaped window
  */
-_X_EXPORT int
+int
 miShapedWindowIn (ScreenPtr pScreen, RegionPtr universe, RegionPtr bounding,
                   BoxPtr rect, int x, int y)
 {
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 8c4b6d08e..498c8a656 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -223,7 +223,7 @@ miMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst, WindowPtr *ppLayerWin)
  *    regions, translate the regions, restore any backing store,
  *    and then send any regions still exposed to the client
  *****/
-_X_EXPORT void
+void
 miHandleValidateExposures(WindowPtr pWin)
 {
     WindowPtr pChild;
@@ -694,7 +694,7 @@ miGetLayerWindow(WindowPtr pWin)
  *    and send appropriate exposure events
  */
 
-_X_EXPORT void
+void
 miSetShape(WindowPtr pWin)
 {
     Bool	WasViewable = (Bool)(pWin->viewable);
@@ -750,7 +750,7 @@ miSetShape(WindowPtr pWin)
 
 /* Keeps the same inside(!) origin */
 
-_X_EXPORT void
+void
 miChangeBorderWidth(WindowPtr pWin, unsigned int width)
 {
     int oldwidth;
diff --git a/mi/mizerline.c b/mi/mizerline.c
index e1e8e6e69..a415d73da 100644
--- a/mi/mizerline.c
+++ b/mi/mizerline.c
@@ -363,7 +363,7 @@ miZeroLine(
     xfree(pspanInit);
 }
 
-_X_EXPORT void
+void
 miZeroDashLine(
             DrawablePtr dst,
             GCPtr pgc,