Mark everything in misym.c as _X_EXPORT.

32 files changed, 129 insertions, 128 deletions

diff --git a/mi/miarc.c b/mi/miarc.c
index e6eed58dc..1e51c5d59 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 1.3 2005/04/20 12:25:45 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/mi/miarc.c,v 1.6 2005/07/03 08:53:51 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */
 /***********************************************************
 
@@ -1073,7 +1073,7 @@ miFillWideEllipse(
  * fuller explanation of this.)
  */
 
-void
+_X_EXPORT void
 miPolyArc(pDraw, pGC, narcs, parcs)
     DrawablePtr	pDraw;
     GCPtr	pGC;
diff --git a/mi/mibank.c b/mi/mibank.c
index b09f9fd7c..2ca8f4782 100644
--- a/mi/mibank.c
+++ b/mi/mibank.c
@@ -2166,7 +2166,7 @@ miBankRestoreAreas(
     SCREEN_RESTORE;
 }
 
-Bool
+_X_EXPORT Bool
 miInitializeBanking(
     ScreenPtr     pScreen,
     unsigned int  xsize,
@@ -2413,7 +2413,7 @@ miBankNewSerialNumber(
 }
 
 /* This entry modifies the banking interface */
-Bool
+_X_EXPORT Bool
 miModifyBanking(
     ScreenPtr     pScreen,
     miBankInfoPtr pBankInfo
diff --git a/mi/mibitblt.c b/mi/mibitblt.c
index 0caad083f..b7fb4cc5d 100644
--- a/mi/mibitblt.c
+++ b/mi/mibitblt.c
@@ -75,7 +75,7 @@ extern int ffs(int);
  *     set them in the destination with SetSpans
  * We let SetSpans worry about clipping to the destination.
  */
-RegionPtr
+_X_EXPORT RegionPtr
 miCopyArea(pSrcDrawable, pDstDrawable,
 	    pGC, xIn, yIn, widthSrc, heightSrc, xOut, yOut)
     register DrawablePtr 	pSrcDrawable;
@@ -553,7 +553,7 @@ miOpqStipDrawable(pDraw, pGC, prgnSrc, pbits, srcx, w, h, dstx, dsty)
  * build a source clip
  * Use the bitmap we've built up as a Stipple for the destination 
  */
-RegionPtr
+_X_EXPORT RegionPtr
 miCopyPlane(pSrcDrawable, pDstDrawable,
 	    pGC, srcx, srcy, width, height, dstx, dsty, bitPlane)
     DrawablePtr 	pSrcDrawable;
@@ -647,7 +647,7 @@ miCopyPlane(pSrcDrawable, pDstDrawable,
  * XY format:
  * get the single plane specified in planemask
  */
-void
+_X_EXPORT void
 miGetImage(pDraw, sx, sy, w, h, format, planeMask, pDst)
     DrawablePtr 	pDraw;
     int			sx, sy, w, h;
@@ -748,7 +748,7 @@ miGetImage(pDraw, sx, sy, w, h, format, planeMask, pDst)
  * ZPixmap format:
  *	This part is simple, just call SetSpans
  */
-void
+_X_EXPORT void
 miPutImage(pDraw, pGC, depth, x, y, w, h, leftPad, format, pImage)
     DrawablePtr		pDraw;
     GCPtr		pGC;
diff --git a/mi/mibstore.c b/mi/mibstore.c
index 98947217c..99985f24a 100644
--- a/mi/mibstore.c
+++ b/mi/mibstore.c
@@ -357,7 +357,7 @@ static GCFuncs miBSCheapGCFuncs = {
  * must be previously initialized.
  */
 
-void
+_X_EXPORT void
 miInitializeBackingStore (pScreen)
     ScreenPtr	pScreen;
 {
diff --git a/mi/micmap.c b/mi/micmap.c
index 98f3e521d..da2f4d88e 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -48,15 +48,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "globals.h"
 #include "micmap.h"
 
-ColormapPtr miInstalledMaps[MAXSCREENS];
+_X_EXPORT ColormapPtr miInstalledMaps[MAXSCREENS];
 
 static Bool miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp,
 		int *ndepthp, int *rootDepthp, VisualID *defaultVisp,
 		unsigned long sizes, int bitsPerRGB, int preferredVis);
 
-miInitVisualsProcPtr miInitVisualsProc = miDoInitVisuals;
+_X_EXPORT miInitVisualsProcPtr miInitVisualsProc = miDoInitVisuals;
 
-int
+_X_EXPORT int
 miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
 {
     if (miInstalledMaps[pScreen->myNum]) {
@@ -66,7 +66,7 @@ miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
     return 0;
 }
 
-void
+_X_EXPORT void
 miInstallColormap(ColormapPtr pmap)
 {
     int index = pmap->pScreen->myNum;
@@ -85,7 +85,7 @@ miInstallColormap(ColormapPtr pmap)
     }
 }
 
-void
+_X_EXPORT void
 miUninstallColormap(ColormapPtr pmap)
 {
     int index = pmap->pScreen->myNum;
@@ -102,7 +102,7 @@ miUninstallColormap(ColormapPtr pmap)
     }
 }
 
-void
+_X_EXPORT void
 miResolveColor(unsigned short *pred, unsigned short *pgreen,
 		unsigned short *pblue, VisualPtr pVisual)
 {
@@ -124,7 +124,7 @@ miResolveColor(unsigned short *pred, unsigned short *pgreen,
     }
 }
 
-Bool
+_X_EXPORT Bool
 miInitializeColormap(ColormapPtr pmap)
 {
     register unsigned i;
@@ -209,7 +209,7 @@ miInitializeColormap(ColormapPtr pmap)
     outdefs[i].blue = pmap->blue[blue >> pVisual->offsetBlue].co.local.blue; \
 }
 
-int
+_X_EXPORT int
 miExpandDirectColors(ColormapPtr pmap, int ndef, xColorItem *indefs,
 			xColorItem *outdefs)
 {
@@ -269,7 +269,7 @@ miExpandDirectColors(ColormapPtr pmap, int ndef, xColorItem *indefs,
     return nresult;
 }
 
-Bool
+_X_EXPORT Bool
 miCreateDefColormap(ScreenPtr pScreen)
 {
 /* 
@@ -386,7 +386,7 @@ static int  miVisualPriority[] = {
 
 static miVisualsPtr	miVisuals;
 
-void
+_X_EXPORT void
 miClearVisualTypes()
 {
     miVisualsPtr v;
@@ -398,7 +398,7 @@ miClearVisualTypes()
 }
 
 
-Bool
+_X_EXPORT Bool
 miSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB, 
 			 int preferredCVC,
 			 Pixel redMask, Pixel greenMask, Pixel blueMask)
@@ -432,14 +432,14 @@ miSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB,
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 miSetVisualTypes(int depth, int visuals, int bitsPerRGB, int preferredCVC)
 {
     return miSetVisualTypesAndMasks (depth, visuals, bitsPerRGB,
 				     preferredCVC, 0, 0, 0);
 }
 
-int
+_X_EXPORT int
 miGetDefaultVisualMask(int depth)
 {
     if (depth > MAX_PSEUDO_DEPTH)
@@ -463,7 +463,7 @@ miVisualTypesSet (int depth)
     return FALSE;
 }
 
-Bool
+_X_EXPORT Bool
 miSetPixmapDepths (void)
 {
     int	d, f;
@@ -481,7 +481,7 @@ miSetPixmapDepths (void)
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 miInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp,
 		int *ndepthp, int *rootDepthp, VisualID *defaultVisp,
 		unsigned long sizes, int bitsPerRGB, int preferredVis)
diff --git a/mi/micursor.c b/mi/micursor.c
index d499e60f5..2868966e6 100644
--- a/mi/micursor.c
+++ b/mi/micursor.c
@@ -57,7 +57,7 @@ SOFTWARE.
 
 extern Bool Must_have_memory;
 
-void
+_X_EXPORT void
 miRecolorCursor( pScr, pCurs, displayed)
     ScreenPtr	pScr;
     CursorPtr	pCurs;
diff --git a/mi/midash.c b/mi/midash.c
index 5def4d9c8..7948a48ce 100644
--- a/mi/midash.c
+++ b/mi/midash.c
@@ -277,7 +277,7 @@ CheckDashStorage(
     return(*ppseg+(nseg-1));
 }
 
-void
+_X_EXPORT void
 miStepDash (dist, pDashIndex, pDash, numInDashList, pDashOffset)
     int dist;			/* distance to step */
     int *pDashIndex;		/* current dash */
diff --git a/mi/midispcur.c b/mi/midispcur.c
index 080ac1c59..71b374fbc 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -112,7 +112,7 @@ static miSpriteCursorFuncRec miDCFuncs = {
     miDCChangeSave,
 };
 
-Bool
+_X_EXPORT Bool
 miDCInitialize (pScreen, screenFuncs)
     ScreenPtr		    pScreen;
     miPointerScreenFuncPtr  screenFuncs;
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 73987de6d..85fefb21f 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.3 2005/04/20 12:25:45 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/mi/miexpose.c,v 1.6 2005/07/03 08:53:51 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.9tsi Exp $ */
 /***********************************************************
 
@@ -130,7 +130,7 @@ exposing is done by the backing store's GraphicsExpose function, of course.
 
 */
 
-RegionPtr
+_X_EXPORT RegionPtr
 miHandleExposures(pSrcDrawable, pDstDrawable,
 		  pGC, srcx, srcy, width, height, dstx, dsty, plane)
     register DrawablePtr	pSrcDrawable;
@@ -379,7 +379,7 @@ miHandleExposures(pSrcDrawable, pDstDrawable,
 
 /* send GraphicsExpose events, or a NoExpose event, based on the region */
 
-void
+_X_EXPORT void
 miSendGraphicsExpose (client, pRgn, drawable, major, minor)
     ClientPtr	client;
     RegionPtr	pRgn;
@@ -493,7 +493,7 @@ miSendExposures(pWin, pRgn, dx, dy)
     DEALLOCATE_LOCAL(pEvent);
 }
 
-void 
+_X_EXPORT void 
 miWindowExposures(pWin, prgn, other_exposed)
     WindowPtr pWin;
     register RegionPtr prgn, other_exposed;
@@ -630,7 +630,7 @@ tossGC (
 }
 
 
-void
+_X_EXPORT void
 miPaintWindow(pWin, prgn, what)
 register WindowPtr pWin;
 RegionPtr prgn;
@@ -884,7 +884,7 @@ int what;
 /* MICLEARDRAWABLE -- sets the entire drawable to the background color of
  * the GC.  Useful when we have a scratch drawable and need to initialize 
  * it. */
-void
+_X_EXPORT void
 miClearDrawable(pDraw, pGC)
     DrawablePtr	pDraw;
     GCPtr	pGC;
diff --git a/mi/mifillarc.c b/mi/mifillarc.c
index 0dcf25d05..323cd0e76 100644
--- a/mi/mifillarc.c
+++ b/mi/mifillarc.c
@@ -54,7 +54,7 @@ Author:  Bob Scheifler, MIT X Consortium
 #define Dsin(d)	sin((double)d*(M_PI/11520.0))
 #define Dcos(d)	cos((double)d*(M_PI/11520.0))
 
-void
+_X_EXPORT void
 miFillArcSetup(arc, info)
     register xArc *arc;
     register miFillArcRec *info;
@@ -316,7 +316,7 @@ miGetPieEdge(
     miGetArcEdge(arc, edge, k, top, left);
 }
 
-void
+_X_EXPORT void
 miFillArcSliceSetup(arc, slice, pGC)
     register xArc *arc;
     register miArcSliceRec *slice;
@@ -785,7 +785,7 @@ miFillArcSliceD(
  * Since we don't have to worry about overlapping segments, we can just
  * fill each arc as it comes.
  */
-void
+_X_EXPORT void
 miPolyFillArc(pDraw, pGC, narcs, parcs)
     DrawablePtr	pDraw;
     GCPtr	pGC;
diff --git a/mi/mifillrct.c b/mi/mifillrct.c
index 9f68db720..ce4b0e57b 100644
--- a/mi/mifillrct.c
+++ b/mi/mifillrct.c
@@ -68,7 +68,7 @@ SOFTWARE.
  * then call FillSpans to fill each rectangle.  We let FillSpans worry about
  * clipping to the destination
  */
-void
+_X_EXPORT void
 miPolyFillRect(pDrawable, pGC, nrectFill, prectInit)
     DrawablePtr	pDrawable;
     GCPtr	pGC;
diff --git a/mi/migc.c b/mi/migc.c
index 0cffe98a4..b6c7c770e 100644
--- a/mi/migc.c
+++ b/mi/migc.c
@@ -40,7 +40,7 @@ from The Open Group.
 #include "migc.h"
 
 /* ARGSUSED */
-void
+_X_EXPORT void
 miChangeGC(pGC, mask)
     GCPtr           pGC;
     unsigned long   mask;
@@ -48,7 +48,7 @@ miChangeGC(pGC, mask)
     return;
 }
 
-void
+_X_EXPORT void
 miDestroyGC(pGC)
     GCPtr           pGC;
 {
@@ -63,7 +63,7 @@ miDestroyGC(pGC)
  * create a private op array for a gc
  */
 
-GCOpsPtr
+_X_EXPORT GCOpsPtr
 miCreateGCOps(prototype)
     GCOpsPtr        prototype;
 {
@@ -79,7 +79,7 @@ miCreateGCOps(prototype)
     return ret;
 }
 
-void
+_X_EXPORT void
 miDestroyGCOps(ops)
     GCOpsPtr        ops;
 {
@@ -88,7 +88,7 @@ miDestroyGCOps(ops)
 }
 
 
-void
+_X_EXPORT void
 miDestroyClip(pGC)
     GCPtr           pGC;
 {
@@ -110,7 +110,7 @@ miDestroyClip(pGC)
     pGC->clientClipType = CT_NONE;
 }
 
-void
+_X_EXPORT void
 miChangeClip(pGC, type, pvalue, nrects)
     GCPtr           pGC;
     int             type;
@@ -141,7 +141,7 @@ miChangeClip(pGC, type, pvalue, nrects)
     pGC->stateChanges |= GCClipMask;
 }
 
-void
+_X_EXPORT void
 miCopyClip(pgcDst, pgcSrc)
     GCPtr           pgcDst, pgcSrc;
 {
@@ -166,7 +166,7 @@ miCopyClip(pgcDst, pgcSrc)
 }
 
 /* ARGSUSED */
-void
+_X_EXPORT void
 miCopyGC(pGCSrc, changes, pGCDst)
     GCPtr           pGCSrc;
     unsigned long   changes;
@@ -175,7 +175,7 @@ miCopyGC(pGCSrc, changes, pGCDst)
     return;
 }
 
-void
+_X_EXPORT void
 miComputeCompositeClip(pGC, pDrawable)
     GCPtr           pGC;
     DrawablePtr     pDrawable;
diff --git a/mi/miglblt.c b/mi/miglblt.c
index 12d0aa932..beca1a0b6 100644
--- a/mi/miglblt.c
+++ b/mi/miglblt.c
@@ -83,7 +83,7 @@ with the sample server.
 	use the bitmap in a call to PushPixels
 */
 
-void
+_X_EXPORT void
 miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
     DrawablePtr pDrawable;
     GC 		*pGC;
@@ -196,7 +196,7 @@ miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
 }
 
 
-void
+_X_EXPORT void
 miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
     DrawablePtr pDrawable;
     GC 		*pGC;
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 55eff4306..5d7b0b079 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.29 2006/01/06 23:06:15 ajax Exp $ */
+/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.30 2006/01/08 23:43:54 ajax Exp $ */
 /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
 /***********************************************************
 
@@ -790,8 +790,9 @@ InitVisualWrap()
 	(*__miHookInitVisualsFunction)(&miInitVisualsProc);
 }
 
-void miHookInitVisuals(void (**old)(miInitVisualsProcPtr *),
-		       void (*new)(miInitVisualsProcPtr *))
+_X_EXPORT void
+miHookInitVisuals(void (**old)(miInitVisualsProcPtr *),
+		  void (*new)(miInitVisualsProcPtr *))
 {
     if (old)
 	*old = __miHookInitVisualsFunction;
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index 545927b53..9820cc65e 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -103,7 +103,7 @@ static void miOverlayChangeBorderWidth(WindowPtr, unsigned int);
                                     HasBorder(w) && \
                                     (w)->backgroundState == ParentRelative)
 
-Bool
+_X_EXPORT Bool
 miInitOverlay(
     ScreenPtr pScreen, 
     miOverlayInOverlayFunc inOverlayFunc,
@@ -1730,7 +1730,7 @@ miOverlayChangeBorderWidth(
 /*  We need this as an addition since the xf86 common code doesn't
     know about the second tree which is static to this file.  */
 
-void
+_X_EXPORT void
 miOverlaySetRootClip(ScreenPtr pScreen, Bool enable)
 {
     WindowPtr pRoot = WindowTable[pScreen->myNum];
@@ -1818,7 +1818,7 @@ miOverlayClearToBackground(
 /****************************************************************/
 
 /* not used */
-Bool
+_X_EXPORT Bool
 miOverlayGetPrivateClips(
     WindowPtr pWin,
     RegionPtr *borderClip,
@@ -1837,7 +1837,7 @@ miOverlayGetPrivateClips(
     return FALSE;
 }
 
-void 
+_X_EXPORT void 
 miOverlaySetTransFunction (
    ScreenPtr pScreen, 
    miOverlayTransFunc transFunc
@@ -1845,13 +1845,13 @@ miOverlaySetTransFunction (
     MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->MakeTransparent = transFunc;
 }
 
-Bool 
+_X_EXPORT Bool 
 miOverlayCopyUnderlay(ScreenPtr pScreen)
 {
     return MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->copyUnderlay;
 }
 
-void
+_X_EXPORT void
 miOverlayComputeCompositeClip(GCPtr pGC, WindowPtr pWin)
 {
     ScreenPtr       pScreen = pGC->pScreen;
@@ -1907,7 +1907,7 @@ miOverlayComputeCompositeClip(GCPtr pGC, WindowPtr pWin)
     }
 }
 
-Bool
+_X_EXPORT Bool
 miOverlayCollectUnderlayRegions(
     WindowPtr pWin,
     RegionPtr *region
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 432cc1606..2b8fa0d3d 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
 # include   "cursorstr.h"
 # include   "dixstruct.h"
 
-int  miPointerScreenIndex;
+_X_EXPORT int miPointerScreenIndex;
 static unsigned long miPointerGeneration = 0;
 
 #define GetScreenPrivate(s) ((miPointerScreenPtr) ((s)->devPrivates[miPointerScreenIndex].ptr))
@@ -71,7 +71,7 @@ static Bool miPointerSetCursorPosition(ScreenPtr pScreen, int x, int y,
 static Bool miPointerCloseScreen(int index, ScreenPtr pScreen);
 static void miPointerMove(ScreenPtr pScreen, int x, int y, unsigned long time);
 
-Bool
+_X_EXPORT Bool
 miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate)
     ScreenPtr		    pScreen;
     miPointerSpriteFuncPtr  spriteFuncs;
@@ -233,7 +233,7 @@ miPointerSetCursorPosition(pScreen, x, y, generateEvent)
 
 /* Once signals are ignored, the WarpCursor function can call this */
 
-void
+_X_EXPORT void
 miPointerWarpCursor (pScreen, x, y)
     ScreenPtr	pScreen;
     int		x, y;
@@ -268,13 +268,13 @@ miPointerWarpCursor (pScreen, x, y)
  * Pointer/CursorDisplay interface routines
  */
 
-int
+_X_EXPORT int
 miPointerGetMotionBufferSize ()
 {
     return MOTION_SIZE;
 }
 
-int
+_X_EXPORT int
 miPointerGetMotionEvents (pPtr, coords, start, stop, pScreen)
     DeviceIntPtr    pPtr;
     xTimecoord	    *coords;
@@ -399,7 +399,7 @@ miPointerSetNewScreen(int screen_no, int x, int y)
    	miPointer.limits.y2 = pScreen->height;
 }
 
-ScreenPtr
+_X_EXPORT ScreenPtr
 miPointerCurrentScreen ()
 {
 	return (miPointer.pScreen);
@@ -409,7 +409,7 @@ miPointerCurrentScreen ()
  * miPointerAbsoluteCursor.  The pointer has moved to x,y
  */
 
-void
+_X_EXPORT void
 miPointerAbsoluteCursor (x, y, time)
     int		    x, y;
     unsigned long   time;
@@ -456,7 +456,7 @@ miPointerAbsoluteCursor (x, y, time)
     miPointerMove (pScreen, x, y, time);
 }
 
-void
+_X_EXPORT void
 miPointerPosition (x, y)
     int	    *x, *y;
 {
diff --git a/mi/mipoly.c b/mi/mipoly.c
index 403d3da56..3a968e47f 100644
--- a/mi/mipoly.c
+++ b/mi/mipoly.c
@@ -68,7 +68,7 @@ SOFTWARE.
 #include "regionstr.h"
 
 
-void
+_X_EXPORT void
 miFillPolygon(dst, pgc, shape, mode, count, pPts)
     DrawablePtr		dst;
     register GCPtr	pgc;
diff --git a/mi/mipolycon.c b/mi/mipolycon.c
index 10c43a78e..428fc3f96 100644
--- a/mi/mipolycon.c
+++ b/mi/mipolycon.c
@@ -73,7 +73,7 @@ static int getPolyYBounds(DDXPointPtr pts, int n, int *by, int *ty);
  *     For a derivation of the algorithm, see the author of
  *     this code.
  */
-Bool
+_X_EXPORT Bool
 miFillConvexPoly(dst, pgc, count, ptsIn)
     DrawablePtr dst;
     GCPtr	pgc;
diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c
index 5d615c28d..797c19773 100644
--- a/mi/mipolypnt.c
+++ b/mi/mipolypnt.c
@@ -57,7 +57,7 @@ SOFTWARE.
 #include "windowstr.h"
 #include "mi.h"
 
-void
+_X_EXPORT void
 miPolyPoint(pDrawable, pGC, mode, npt, pptInit)
     DrawablePtr 	pDrawable;
     GCPtr 		pGC;
diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c
index 6740ea8f6..233ba2130 100644
--- a/mi/mipolyrect.c
+++ b/mi/mipolyrect.c
@@ -57,7 +57,7 @@ SOFTWARE.
 #include "pixmap.h"
 #include "mi.h"
 
-void
+_X_EXPORT void
 miPolyRectangle(pDraw, pGC, nrects, pRects)
     DrawablePtr	pDraw;
     GCPtr	pGC;
diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c
index dcf3d815a..2a37e8ca9 100644
--- a/mi/mipolyseg.c
+++ b/mi/mipolyseg.c
@@ -68,7 +68,7 @@ SOFTWARE.
  *****************************************************************/
 
 
-void
+_X_EXPORT void
 miPolySegment(pDraw, pGC, nseg, pSegs)
     DrawablePtr pDraw;
     GCPtr 	pGC;
diff --git a/mi/mipolytext.c b/mi/mipolytext.c
index c2bbaba38..2ce94fee8 100644
--- a/mi/mipolytext.c
+++ b/mi/mipolytext.c
@@ -92,7 +92,7 @@ miPolyText(pDraw, pGC, x, y, count, chars, fontEncoding)
 }
 
 
-int
+_X_EXPORT int
 miPolyText8(pDraw, pGC, x, y, count, chars)
     DrawablePtr pDraw;
     GCPtr	pGC;
@@ -115,7 +115,7 @@ miPolyText8(pDraw, pGC, x, y, count, chars)
 }
 
 
-int
+_X_EXPORT int
 miPolyText16(pDraw, pGC, x, y, count, chars)
     DrawablePtr pDraw;
     GCPtr	pGC;
@@ -163,7 +163,7 @@ miImageText(pDraw, pGC, x, y, count, chars, fontEncoding)
 }
 
 
-void
+_X_EXPORT void
 miImageText8(pDraw, pGC, x, y, count, chars)
     DrawablePtr pDraw;
     GCPtr	pGC;
@@ -182,7 +182,7 @@ miImageText8(pDraw, pGC, x, y, count, chars)
 }
 
 
-void
+_X_EXPORT void
 miImageText16(pDraw, pGC, x, y, count, chars)
     DrawablePtr pDraw;
     GCPtr	pGC;
diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c
index 5fce1cae7..9cdb09af9 100644
--- a/mi/mipushpxl.c
+++ b/mi/mipushpxl.c
@@ -79,7 +79,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
  */
-void
+_X_EXPORT void
 miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg)
     GCPtr	pGC;
     PixmapPtr	pBitMap;
diff --git a/mi/miregion.c b/mi/miregion.c
index df3324865..0a6913f3c 100644
--- a/mi/miregion.c
+++ b/mi/miregion.c
@@ -219,8 +219,8 @@ if (((numRects) < ((reg)->data->size >> 1)) && ((reg)->data->size > 50)) \
 }
 
 
-BoxRec miEmptyBox = {0, 0, 0, 0};
-RegDataRec miEmptyData = {0, 0};
+_X_EXPORT BoxRec miEmptyBox = {0, 0, 0, 0};
+_X_EXPORT RegDataRec miEmptyData = {0, 0};
 
 RegDataRec  miBrokenData = {0, 0};
 RegionRec   miBrokenRegion = { { 0, 0, 0, 0 }, &miBrokenData };
@@ -248,7 +248,7 @@ miPrintRegion(rgn)
 }
 #endif /* DEBUG */
 
-Bool
+_X_EXPORT Bool
 miRegionEqual(reg1, reg2)
     RegionPtr reg1;
     RegionPtr reg2;
@@ -331,7 +331,7 @@ miValidRegion(reg)
  *     REGION of "size" number of rectangles.
  *****************************************************************/
 
-RegionPtr
+_X_EXPORT RegionPtr
 miRegionCreate(rect, size)
     BoxPtr rect;
     int size;
@@ -365,7 +365,7 @@ miRegionCreate(rect, size)
  *     Outer region rect is statically allocated.
  *****************************************************************/
 
-void
+_X_EXPORT void
 miRegionInit(pReg, rect, size)
     RegionPtr pReg;
     BoxPtr rect;
@@ -389,7 +389,7 @@ miRegionInit(pReg, rect, size)
     }
 }
 
-void
+_X_EXPORT void
 miRegionDestroy(pReg)
     RegionPtr pReg;
 {
@@ -399,7 +399,7 @@ miRegionDestroy(pReg)
 	xfree(pReg);
 }
 
-void
+_X_EXPORT void
 miRegionUninit(pReg)
     RegionPtr pReg;
 {
@@ -417,7 +417,7 @@ miRegionBreak (pReg)
     return FALSE;
 }
 
-Bool
+_X_EXPORT Bool
 miRectAlloc(
     register RegionPtr pRgn,
     int n)
@@ -458,7 +458,7 @@ miRectAlloc(
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 miRegionCopy(dst, src)
     register RegionPtr dst;
     register RegionPtr src;
@@ -1025,7 +1025,7 @@ miIntersectO (
 }
 
 
-Bool
+_X_EXPORT Bool
 miIntersect(newReg, reg1, reg2)
     register RegionPtr 	newReg;     /* destination Region */
     register RegionPtr 	reg1;
@@ -1180,7 +1180,7 @@ miUnionO (
     return TRUE;
 }
 
-Bool 
+_X_EXPORT Bool 
 miUnion(newReg, reg1, reg2)
     RegionPtr		newReg;                  /* destination Region */
     register RegionPtr 	reg1;
@@ -1279,7 +1279,7 @@ miUnion(newReg, reg1, reg2)
  *      dstrgn is modified if rgn has rectangles.
  *
  */
-Bool
+_X_EXPORT Bool
 miRegionAppend(dstrgn, rgn)
     register RegionPtr dstrgn;
     register RegionPtr rgn;
@@ -1465,7 +1465,7 @@ QuickSortRects(
  *-----------------------------------------------------------------------
  */
 
-Bool
+_X_EXPORT Bool
 miRegionValidate(badreg, pOverlap)
     RegionPtr badreg;
     Bool *pOverlap;
@@ -1656,7 +1656,7 @@ bail:
     return miRegionBreak (badreg);
 }
 
-RegionPtr
+_X_EXPORT RegionPtr
 miRectsToRegion(nrects, prect, ctype)
     int			nrects;
     register xRectangle	*prect;
@@ -1881,7 +1881,7 @@ miSubtractO (
  *
  *-----------------------------------------------------------------------
  */
-Bool
+_X_EXPORT Bool
 miSubtract(regD, regM, regS)
     register RegionPtr	regD;               
     register RegionPtr 	regM;
@@ -1946,7 +1946,7 @@ miSubtract(regD, regM, regS)
  *
  *-----------------------------------------------------------------------
  */
-Bool
+_X_EXPORT Bool
 miInverse(newReg, reg1, invRect)
     RegionPtr 	  newReg;       /* Destination region */
     RegionPtr 	  reg1;         /* Region to invert */
@@ -2006,7 +2006,7 @@ miInverse(newReg, reg1, invRect)
  *   that doesn't overlap the box at all and partIn is false)
  */
 
-int
+_X_EXPORT int
 miRectIn(region, prect)
     register RegionPtr  region;
     register BoxPtr     prect;
@@ -2102,7 +2102,7 @@ miRectIn(region, prect)
    translates in place
 */
 
-void
+_X_EXPORT void
 miTranslateRegion(pReg, x, y)
     register RegionPtr pReg;
     register int x;
@@ -2216,7 +2216,7 @@ miRegionDataCopy(
     return TRUE;
 }
 
-void
+_X_EXPORT void
 miRegionReset(pReg, pBox)
     RegionPtr pReg;
     BoxPtr pBox;
@@ -2229,7 +2229,7 @@ miRegionReset(pReg, pBox)
     pReg->data = (RegDataPtr)NULL;
 }
 
-Bool
+_X_EXPORT Bool
 miPointInRegion(pReg, x, y, box)
     register RegionPtr pReg;
     register int x, y;
@@ -2263,7 +2263,7 @@ miPointInRegion(pReg, x, y, box)
     return(FALSE);
 }
 
-Bool
+_X_EXPORT Bool
 miRegionNotEmpty(pReg)
     RegionPtr pReg;
 {
@@ -2278,7 +2278,7 @@ miRegionBroken(RegionPtr pReg)
     return (REGION_NAR(pReg));
 }
 
-void
+_X_EXPORT void
 miRegionEmpty(pReg)
     RegionPtr pReg;
 {
@@ -2289,7 +2289,7 @@ miRegionEmpty(pReg)
     pReg->data = &miEmptyData;
 }
 
-BoxPtr
+_X_EXPORT BoxPtr
 miRegionExtents(pReg)
     RegionPtr pReg;
 {
@@ -2415,7 +2415,7 @@ static void QuickSortSpans(
     returns the number of new, clipped scanlines.
 */
 
-int
+_X_EXPORT int
 miClipSpans(
     RegionPtr		    prgnDst,
     register DDXPointPtr    ppt,
@@ -2532,7 +2532,7 @@ miClipSpans(
 }
 
 /* find the band in a region with the most rectangles */
-int
+_X_EXPORT int
 miFindMaxBand(prgn)
     RegionPtr prgn;
 {
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index ae9b6c2ee..907fce435 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -62,7 +62,7 @@ typedef struct
 
 
 /* this plugs into pScreen->ModifyPixmapHeader */
-Bool
+_X_EXPORT Bool
 miModifyPixmapHeader(pPixmap, width, height, depth, bitsPerPixel, devKind,
 		     pPixData)
     PixmapPtr   pPixmap;
@@ -145,7 +145,7 @@ miCloseScreen (iScreen, pScreen)
  * possible private-requesting modules have been inited; we create the
  * screen pixmap here.
  */
-Bool
+_X_EXPORT Bool
 miCreateScreenResources(pScreen)
     ScreenPtr pScreen;
 {
@@ -206,7 +206,7 @@ miScreenDevPrivateInit(pScreen, width, pbits)
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
 	     rootDepth, numDepths, depths, rootVisual, numVisuals, visuals)
     register ScreenPtr pScreen;
@@ -325,7 +325,7 @@ miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
     return miScreenDevPrivateInit(pScreen, width, pbits);
 }
 
-int
+_X_EXPORT int
 miAllocateGCPrivateIndex()
 {
     static int privateIndex = -1;
@@ -339,10 +339,10 @@ miAllocateGCPrivateIndex()
     return privateIndex;
 }
 
-int miZeroLineScreenIndex;
+_X_EXPORT int miZeroLineScreenIndex;
 unsigned int miZeroLineGeneration = 0;
 
-void
+_X_EXPORT void
 miSetZeroLineBias(pScreen, bias)
     ScreenPtr pScreen;
     unsigned int bias;
@@ -356,14 +356,14 @@ miSetZeroLineBias(pScreen, bias)
 	pScreen->devPrivates[miZeroLineScreenIndex].uval = bias;
 }
 
-PixmapPtr
+_X_EXPORT PixmapPtr
 miGetScreenPixmap(pScreen)
     ScreenPtr pScreen;
 {
     return (PixmapPtr)(pScreen->devPrivate);
 }
 
-void
+_X_EXPORT void
 miSetScreenPixmap(pPix)
     PixmapPtr pPix;
 {
diff --git a/mi/misprite.c b/mi/misprite.c
index 3733d25f2..d0973ff46 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -113,7 +113,7 @@ static void miSpriteSetCursor(ScreenPtr pScreen, CursorPtr pCursor,
 			      int x, int y);
 static void miSpriteMoveCursor(ScreenPtr pScreen, int x, int y);
 
-miPointerSpriteFuncRec miSpritePointerFuncs = {
+_X_EXPORT miPointerSpriteFuncRec miSpritePointerFuncs = {
     miSpriteRealizeCursor,
     miSpriteUnrealizeCursor,
     miSpriteSetCursor,
diff --git a/mi/mivaltree.c b/mi/mivaltree.c
index 6a7d6030c..dd3214524 100644
--- a/mi/mivaltree.c
+++ b/mi/mivaltree.c
@@ -1,5 +1,5 @@
 /* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
-/* $XdotOrg: xc/programs/Xserver/mi/mivaltree.c,v 1.4 2005/04/20 12:25:45 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/mi/mivaltree.c,v 1.6 2005/07/03 07:01:51 daniels Exp $ */
 /*
  * mivaltree.c --
  *	Functions for recalculating window clip lists. Main function
@@ -110,7 +110,7 @@ Equipment Corporation.
 /*
  * Compute the visibility of a shaped window
  */
-int
+_X_EXPORT int
 miShapedWindowIn (pScreen, universe, bounding, rect, x, y)
     ScreenPtr	pScreen;
     RegionPtr	universe, bounding;
diff --git a/mi/miwideline.c b/mi/miwideline.c
index 44cf18f2e..cd65c7792 100644
--- a/mi/miwideline.c
+++ b/mi/miwideline.c
@@ -261,7 +261,7 @@ miFillRectPolyHelper (
     }
 }
 
-/* static */ int
+_X_EXPORT /* static */ int
 miPolyBuildEdge (x0, y0, k, dx, dy, xi, yi, left, edge)
     double	x0, y0;
     double	k;  /* x0 * dy - y0 * dx */
@@ -320,7 +320,7 @@ miPolyBuildEdge (x0, y0, k, dx, dy, xi, yi, left, edge)
 
 #define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr)))
 
-/* static */ int
+_X_EXPORT /* static */ int
 miPolyBuildPoly (vertices, slopes, count, xi, yi, left, right, pnleft, pnright, h)
     register PolyVertexPtr vertices;
     register PolySlopePtr  slopes;
@@ -922,7 +922,7 @@ miRoundJoinFace (face, edge, leftEdge)
     return y;
 }
 
-void
+_X_EXPORT void
 miRoundJoinClip (pLeft, pRight, edge1, edge2, y1, y2, left1, left2)
     register LineFacePtr pLeft, pRight;
     PolyEdgePtr	edge1, edge2;
@@ -947,7 +947,7 @@ miRoundJoinClip (pLeft, pRight, edge1, edge2, y1, y2, left1, left2)
     *y2 = miRoundJoinFace (pRight, edge2, left2);
 }
 
-int
+_X_EXPORT int
 miRoundCapClip (face, isInt, edge, leftEdge)
     register LineFacePtr face;
     Bool	isInt;
@@ -1548,7 +1548,7 @@ miCleanupSpanData (pDrawable, pGC, spanData)
     miFreeSpanGroup (&spanData->fgGroup);
 }
 
-void
+_X_EXPORT void
 miWideLine (pDrawable, pGC, mode, npt, pPts)
     DrawablePtr	pDrawable;
     register GCPtr pGC;
@@ -2046,7 +2046,7 @@ miWideDashSegment (
     *pDashOffset = pDash[dashIndex] - dashRemain;
 }
 
-void
+_X_EXPORT void
 miWideDash (pDrawable, pGC, mode, npt, pPts)
     DrawablePtr	pDrawable;
     register GCPtr pGC;
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 280d0f8eb..47ba433fa 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -59,7 +59,7 @@ SOFTWARE.
 #include "pixmapstr.h"
 #include "mivalidate.h"
 
-void 
+_X_EXPORT void 
 miClearToBackground(pWin, x, y, w, h, generateExposures)
     WindowPtr pWin;
     int x,y;
@@ -447,7 +447,7 @@ miMarkOverlappedWindows(pWin, pFirst, ppLayerWin)
  *    regions, translate the regions, restore any backing store,
  *    and then send any regions still exposed to the client
  *****/
-void
+_X_EXPORT void
 miHandleValidateExposures(pWin)
     WindowPtr pWin;
 {
@@ -981,7 +981,7 @@ miGetLayerWindow(pWin)
  *    and send appropriate exposure events
  */
 
-void
+_X_EXPORT void
 miSetShape(pWin)
     register WindowPtr	pWin;
 {
@@ -1081,7 +1081,7 @@ miSetShape(pWin)
 
 /* Keeps the same inside(!) origin */
 
-void
+_X_EXPORT void
 miChangeBorderWidth(pWin, width)
     register WindowPtr pWin;
     unsigned int width;
@@ -1165,7 +1165,7 @@ miMarkUnrealizedWindow(pChild, pWin, fromConfigure)
     }
 }
 
-void
+_X_EXPORT void
 miSegregateChildren(WindowPtr pWin, RegionPtr pReg, int depth)
 {
     ScreenPtr pScreen;
diff --git a/mi/mizerarc.c b/mi/mizerarc.c
index 62402f41b..f55afee23 100644
--- a/mi/mizerarc.c
+++ b/mi/mizerarc.c
@@ -97,7 +97,7 @@ static miZeroArcPtRec oob = {65536, 65536, 0};
  *
  */
 
-Bool
+_X_EXPORT Bool
 miZeroArcSetup(arc, info, ok360)
     register xArc *arc;
     register miZeroArcRec *info;
@@ -709,7 +709,7 @@ miZeroArcDashPts(
     dinfo->dashOffset = pGC->dash[dinfo->dashIndex] - dashRemaining;
 }
 
-void
+_X_EXPORT void
 miZeroPolyArc(pDraw, pGC, narcs, parcs)
     DrawablePtr	pDraw;
     GCPtr	pGC;
diff --git a/mi/mizerclip.c b/mi/mizerclip.c
index e648b21d4..768936dbd 100644
--- a/mi/mizerclip.c
+++ b/mi/mizerclip.c
@@ -405,7 +405,7 @@ the numerator is therefore (2^32 - 1), which does not overflow an unsigned
  *          -1 for completely clipped line
  *
  */
-int
+_X_EXPORT int
 miZeroClipLine(xmin, ymin, xmax, ymax,
 	       new_x1, new_y1, new_x2, new_y2,
 	       adx, ady,
diff --git a/mi/mizerline.c b/mi/mizerline.c
index 8e62a8c94..56f31d69d 100644
--- a/mi/mizerline.c
+++ b/mi/mizerline.c
@@ -99,7 +99,7 @@ SOFTWARE.
     }\
 }
 
-void
+_X_EXPORT void
 miZeroLine(pDraw, pGC, mode, npt, pptInit)
     DrawablePtr pDraw;
     GCPtr	pGC;
@@ -365,7 +365,7 @@ miZeroLine(pDraw, pGC, mode, npt, pptInit)
     DEALLOCATE_LOCAL(pspanInit);
 }
 
-void
+_X_EXPORT void
 miZeroDashLine(dst, pgc, mode, nptInit, pptInit)
 DrawablePtr dst;
 GCPtr pgc;