Attachment 15112 Details for Bug 14730 – 0005-Make-public-default-visibility-symbols-used-by-diffe.patch

[patch] 0005-Make-public-default-visibility-symbols-used-by-diffe.patch

0005-Make-public-default-visibility-symbols-used-by-diffe.patch (text/plain), 102.40 KB, created by Paulo César Pereira de Andrade on 2008-03-13 23:10:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-03-13 23:10:55 UTC

Size: 102.40 KB

patch

obsolete

>From 8ffae8dfd5ead73bd2254377928459aa514fea19 Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Fri, 14 Mar 2008 03:02:47 -0300
>Subject: [PATCH] Make public/default visibility symbols used by different modules.
>
>This patch doesn't not include the changes to compiler flags.
>Also, this patch only exports symbols required by code that compiles
>at the time this patch was made.
>There are still 2 missing symbols that were removed in some previous
>change, and not tracked in this patch:
>xf4bppOffDrawMonoImage:	libxf4bpp.so
>cfbTEGlyphBlt8:		libxf8_32bpp.so
>
>  The proper fix would be to export everything in the sdk, i.e.
>/usr/include/xorg. But I believe it is a good idea to, at first,
>know when a new dependency appears, but for a release, where compiling
>with hidden symbols would be enabled, the entire sdk should be made
>available.
>---
> GL/glx/glxscreens.c                                |    1 +
> Xext/shape.c                                       |    2 +-
> Xext/shm.c                                         |    4 +-
> Xext/xace.c                                        |    2 +-
> cfb/cfb8bit.c                                      |    2 +-
> cfb/cfb8line.c                                     |    6 +-
> cfb/cfballpriv.c                                   |    2 +-
> cfb/cfbbitblt.c                                    |    4 +-
> cfb/cfbfillarc.c                                   |    2 +-
> cfb/cfbfillrct.c                                   |    2 +-
> cfb/cfbfillsp.c                                    |    4 +-
> cfb/cfbgetsp.c                                     |    2 +-
> cfb/cfbglblt8.c                                    |    2 +-
> cfb/cfbigblt8.c                                    |    2 +-
> cfb/cfbimage.c                                     |    4 +-
> cfb/cfbline.c                                      |    4 +-
> cfb/cfbply1rct.c                                   |    2 +-
> cfb/cfbpolypnt.c                                   |    2 +-
> cfb/cfbpush8.c                                     |    2 +-
> cfb/cfbrrop.c                                      |    2 +-
> cfb/cfbsetsp.c                                     |    2 +-
> cfb/cfbsolid.c                                     |    2 +-
> cfb/cfbzerarc.c                                    |    2 +-
> dix/globals.c                                      |    2 +-
> dix/registry.c                                     |    2 +-
> dix/resource.c                                     |    2 +-
> exa/exa.c                                          |   16 +++---
> exa/exa_migration.c                                |    2 +-
> exa/exa_offscreen.c                                |    8 +-
> exa/exa_unaccel.c                                  |    2 +-
> fb/fb24_32.c                                       |    2 +-
> fb/fballpriv.c                                     |    4 +-
> fb/fbbits.h                                        |    2 +-
> fb/fbblt.c                                         |    2 +-
> fb/fbcmap.c                                        |    2 +-
> fb/fbcmap_mi.c                                     |    2 +-
> fb/fbcopy.c                                        |   10 ++--
> fb/fbfill.c                                        |    2 +-
> fb/fbfillrect.c                                    |    2 +-
> fb/fbfillsp.c                                      |    2 +-
> fb/fbgc.c                                          |    6 +-
> fb/fbgetsp.c                                       |    2 +-
> fb/fbglyph.c                                       |   10 ++--
> fb/fbimage.c                                       |    8 +-
> fb/fbline.c                                        |    4 +-
> fb/fboverlay.c                                     |    6 +-
> fb/fbpict.c                                        |    4 +-
> fb/fbpixmap.c                                      |    6 +-
> fb/fbpoint.c                                       |    2 +-
> fb/fbpseudocolor.c                                 |    2 +-
> fb/fbpush.c                                        |    4 +-
> fb/fbscreen.c                                      |    4 +-
> fb/fbseg.c                                         |    2 +-
> fb/fbsetsp.c                                       |    2 +-
> fb/fbutil.c                                        |    2 +-
> fb/fbwindow.c                                      |    2 +-
> hw/xfree86/common/xf86Cursor.c                     |    6 +-
> hw/xfree86/common/xf86Globals.c                    |    4 +-
> hw/xfree86/common/xf86xv.c                         |    6 +-
> hw/xfree86/ddc/ddcProperty.c                       |    2 +-
> hw/xfree86/ddc/interpret_edid.c                    |    2 +-
> hw/xfree86/ddc/print_edid.c                        |    2 +-
> hw/xfree86/ddc/xf86DDC.c                           |    4 +-
> hw/xfree86/dri/dri.c                               |   54 ++++++++--------
> hw/xfree86/fbdevhw/fbdevhw.c                       |   66 ++++++++++----------
> hw/xfree86/i2c/xf86i2c.c                           |   16 +++---
> hw/xfree86/int10/generic.c                         |   10 ++--
> hw/xfree86/int10/helper_exec.c                     |    2 +-
> hw/xfree86/int10/stub.c                            |   14 ++--
> hw/xfree86/int10/xf86x86emu.c                      |    2 +-
> hw/xfree86/modes/xf86Crtc.c                        |    2 +-
> hw/xfree86/os-support/linux/int10/linux.c          |   10 ++--
> .../os-support/linux/int10/vm86/linux_vm86.c       |    2 +-
> hw/xfree86/ramdac/BT.c                             |    2 +-
> hw/xfree86/ramdac/IBM.c                            |    8 +-
> hw/xfree86/ramdac/TI.c                             |    6 +-
> hw/xfree86/ramdac/xf86Cursor.c                     |    8 +-
> hw/xfree86/ramdac/xf86RamDac.c                     |   18 +++---
> hw/xfree86/ramdac/xf86RamDacCmap.c                 |    2 +-
> hw/xfree86/shadowfb/shadow.c                       |    4 +-
> hw/xfree86/vbe/vbe.c                               |   34 +++++-----
> hw/xfree86/vbe/vbeModes.c                          |   12 ++--
> hw/xfree86/vgahw/vgaHW.c                           |   56 ++++++++--------
> hw/xfree86/xaa/xaaBitOrder.c                       |    3 +-
> hw/xfree86/xaa/xaaFallback.c                       |    2 +-
> hw/xfree86/xaa/xaaFillRect.c                       |    2 +-
> hw/xfree86/xaa/xaaImage.c                          |    2 +-
> hw/xfree86/xaa/xaaInit.c                           |   10 ++--
> hw/xfree86/xaa/xaaLine.c                           |    2 +-
> hw/xfree86/xaa/xaaOverlayDF.c                      |    2 +-
> hw/xfree86/xaa/xaaPCache.c                         |    2 +-
> hw/xfree86/xaa/xaaPict.c                           |    2 +-
> hw/xfree86/xaa/xaaROP.c                            |   12 ++--
> hw/xfree86/xaa/xaaStipple.c                        |    2 +-
> hw/xfree86/xaa/xaaTEGlyph.c                        |    2 +-
> hw/xfree86/xaa/xaaWrapper.c                        |    2 +-
> hw/xfree86/xf4bpp/ppcIO.c                          |    2 +-
> hw/xfree86/xf8_32bpp/cfbscrinit.c                  |    2 +-
> hw/xfree86/xf8_32bpp/xf86overlay.c                 |    2 +-
> mfb/maskbits.c                                     |   13 ++--
> mfb/mfbbitblt.c                                    |    2 +-
> mfb/mfbclip.c                                      |    4 +-
> mfb/mfbfillsp.c                                    |    2 +-
> mfb/mfbfont.c                                      |    8 +-
> mfb/mfbgc.c                                        |    6 +-
> mfb/mfbgetsp.c                                     |    2 +-
> mfb/mfbimage.c                                     |    2 +-
> mfb/mfbmisc.c                                      |    4 +-
> mfb/mfbpixmap.c                                    |    6 +-
> mfb/mfbpushpxl.c                                   |    4 +-
> mfb/mfbscrinit.c                                   |    8 +-
> mfb/mfbsetsp.c                                     |    2 +-
> mi/miregion.c                                      |    2 +-
> miext/damage/damage.c                              |   16 +++---
> miext/shadow/shadow.c                              |    8 +-
> miext/shadow/shpacked.c                            |    2 +-
> miext/shadow/shplanar.c                            |    4 +-
> miext/shadow/shrotate.c                            |    2 +-
> miext/shadow/shrotpack.h                           |    2 +-
> os/WaitFor.c                                       |    4 +-
> os/utils.c                                         |    2 +-
> os/xprintf.c                                       |    2 +-
> randr/randr.c                                      |    2 +-
> randr/rrcrtc.c                                     |    2 +-
> randr/rrinfo.c                                     |    7 +-
> randr/rrproperty.c                                 |    4 +-
> render/filter.c                                    |    4 +-
> render/mipict.c                                    |    4 +-
> render/mitrap.c                                    |    2 +-
> render/mitri.c                                     |    2 +-
> render/picture.c                                   |   16 +++---
> 131 files changed, 374 insertions(+), 370 deletions(-)
>
>diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
>index 6575b27..1adce02 100644
>--- a/GL/glx/glxscreens.c
>+++ b/GL/glx/glxscreens.c
>@@ -273,6 +273,7 @@ glxGetScreen(ScreenPtr pScreen)
>     return dixLookupPrivate(&pScreen->devPrivates, glxScreenPrivateKey);
> }
> 
>+_X_EXPORT
> void GlxSetVisualConfigs(int nconfigs, 
>                          __GLXvisualConfig *configs, void **privates)
> {
>diff --git a/Xext/shape.c b/Xext/shape.c
>index 2f1baf9..52ad6f6 100644
>--- a/Xext/shape.c
>+++ b/Xext/shape.c
>@@ -139,7 +139,7 @@ typedef struct _ShapeEvent {
>  *
>  ****************/
> 
>-void
>+_X_EXPORT void
> ShapeExtensionInit(void)
> {
>     ExtensionEntry *extEntry;
>diff --git a/Xext/shm.c b/Xext/shm.c
>index b2973bf..c850547 100644
>--- a/Xext/shm.c
>+++ b/Xext/shm.c
>@@ -290,7 +290,7 @@ ExtensionEntry	*extEntry;
>     }
> }
> 
>-void
>+_X_EXPORT void
> ShmRegisterFuncs(
>     ScreenPtr pScreen,
>     ShmFuncsPtr funcs)
>@@ -327,7 +327,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
>     return ret;
> }
> 
>-void
>+_X_EXPORT void
> ShmRegisterFbFuncs(pScreen)
>     ScreenPtr pScreen;
> {
>diff --git a/Xext/xace.c b/Xext/xace.c
>index 8a8f8c6..4956131 100644
>--- a/Xext/xace.c
>+++ b/Xext/xace.c
>@@ -80,7 +80,7 @@ void XaceHookAuditEnd(ClientPtr ptr, int result)
> 
> /* Entry point for hook functions.  Called by Xserver.
>  */
>-int XaceHook(int hook, ...)
>+_X_EXPORT int XaceHook(int hook, ...)
> {
>     pointer calldata;	/* data passed to callback */
>     int *prv = NULL;	/* points to return value from callback */
>diff --git a/cfb/cfb8bit.c b/cfb/cfb8bit.c
>index 54a08c5..5a026d0 100644
>--- a/cfb/cfb8bit.c
>+++ b/cfb/cfb8bit.c
>@@ -365,7 +365,7 @@ PixelGroup cfb8BitLenMasks[PGSZ] = {
> 
> 
> 
>-int
>+_X_EXPORT int
> cfb8ComputeClipMasks32 (pBox, numRects, x, y, w, h, clips)
>     BoxPtr	pBox;
>     int		numRects;
>diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c
>index 8c00d9f..7989ea6 100644
>--- a/cfb/cfb8line.c
>+++ b/cfb/cfb8line.c
>@@ -262,7 +262,7 @@ in this Software without prior written authorization from The Open Group.
> 
> #ifdef INCLUDE_DRAW
> 
>-int
>+_X_EXPORT int
> #ifdef POLYSEGMENT
> FUNC_NAME(cfb8SegmentSS1Rect) (pDrawable, pGC, nseg, pSegInit)
>     DrawablePtr	pDrawable;
>@@ -1101,7 +1101,7 @@ FUNC_NAME(cfb8LineSS1Rect) (pDrawable, pGC, mode, npt, pptInit, pptInitOrig,
> 
> #ifdef POLYSEGMENT
> 
>-void
>+_X_EXPORT void
> cfb8SegmentSS1Rect (pDrawable, pGC, nseg, pSegInit)
>     DrawablePtr	    pDrawable;
>     GCPtr	    pGC;
>@@ -1164,7 +1164,7 @@ cfb8SegmentSS1Rect (pDrawable, pGC, nseg, pSegInit)
> 
> #else /* POLYSEGMENT */
> 
>-void
>+_X_EXPORT void
> cfb8LineSS1Rect (pDrawable, pGC, mode, npt, pptInit)
>     DrawablePtr	pDrawable;
>     GCPtr	pGC;
>diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c
>index 3b58266..2836224 100644
>--- a/cfb/cfballpriv.c
>+++ b/cfb/cfballpriv.c
>@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
> #include "mibstore.h"
> 
> #if 1 || PSZ==8
>-DevPrivateKey cfbGCPrivateKey = &cfbGCPrivateKey;
>+_X_EXPORT DevPrivateKey cfbGCPrivateKey = &cfbGCPrivateKey;
> #endif
> #ifdef CFB_NEED_SCREEN_PRIVATE
> DevPrivateKey cfbScreenPrivateKey = &cfbScreenPrivateKey;
>diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c
>index 00bf413..8421652 100644
>--- a/cfb/cfbbitblt.c
>+++ b/cfb/cfbbitblt.c
>@@ -631,7 +631,7 @@ cfbDoBitblt (pSrc, pDst, alu, prgnDst, pptSrc, planemask)
>     (*doBitBlt) (pSrc, pDst, alu, prgnDst, pptSrc, planemask);
> }
> 
>-RegionPtr
>+_X_EXPORT RegionPtr
> cfbCopyArea(pSrcDrawable, pDstDrawable,
>             pGC, srcx, srcy, width, height, dstx, dsty)
>     register DrawablePtr pSrcDrawable;
>@@ -1345,7 +1345,7 @@ cfbCopyPlane1to32
> 
> /* shared among all different cfb depths through linker magic */
> 
>-RegionPtr cfbCopyPlane(pSrcDrawable, pDstDrawable,
>+_X_EXPORT RegionPtr cfbCopyPlane(pSrcDrawable, pDstDrawable,
> 	    pGC, srcx, srcy, width, height, dstx, dsty, bitPlane)
>     DrawablePtr 	pSrcDrawable;
>     DrawablePtr		pDstDrawable;
>diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c
>index 0eb5ff4..cc7b146 100644
>--- a/cfb/cfbfillarc.c
>+++ b/cfb/cfbfillarc.c
>@@ -321,7 +321,7 @@ RROP_NAME(cfbFillArcSliceSolid)(
>     RROP_UNDECLARE
> }
> 
>-void
>+_X_EXPORT void
> RROP_NAME(cfbPolyFillArcSolid) (pDraw, pGC, narcs, parcs)
>     DrawablePtr	pDraw;
>     GCPtr	pGC;
>diff --git a/cfb/cfbfillrct.c b/cfb/cfbfillrct.c
>index fc2d31b..4eff668 100644
>--- a/cfb/cfbfillrct.c
>+++ b/cfb/cfbfillrct.c
>@@ -103,7 +103,7 @@ cfbFillRectTileOdd (pDrawable, pGC, nBox, pBox)
> 
> #define NUM_STACK_RECTS	1024
> 
>-void
>+_X_EXPORT void
> cfbPolyFillRect(pDrawable, pGC, nrectFill, prectInit)
>     DrawablePtr pDrawable;
>     register GCPtr pGC;
>diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c
>index 36710b6..cf2156d 100644
>--- a/cfb/cfbfillsp.c
>+++ b/cfb/cfbfillsp.c
>@@ -143,7 +143,7 @@ dumpspans(n, ppt, pwidth)
> #endif
> 
> /* Fill spans with tiles that aren't 32 bits wide */
>-void
>+_X_EXPORT void
> cfbUnnaturalTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
> DrawablePtr pDrawable;
> GC		*pGC;
>@@ -209,7 +209,7 @@ int fSorted;
> 
> #if PSZ == 8
> 
>-void
>+_X_EXPORT void
> cfbUnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
> DrawablePtr pDrawable;
> GC		*pGC;
>diff --git a/cfb/cfbgetsp.c b/cfb/cfbgetsp.c
>index 672196a..19e09cd 100644
>--- a/cfb/cfbgetsp.c
>+++ b/cfb/cfbgetsp.c
>@@ -68,7 +68,7 @@ SOFTWARE.
>  * Each scanline returned will be server scanline padded, i.e., it will come
>  * out to an integral number of words.
>  */
>-void
>+_X_EXPORT void
> cfbGetSpans(pDrawable, wMax, ppt, pwidth, nspans, pchardstStart)
>     DrawablePtr		pDrawable;	/* drawable from which to get bits */
>     int			wMax;		/* largest value of all *pwidths */
>diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c
>index 4d964b3..6e1e5e8 100644
>--- a/cfb/cfbglblt8.c
>+++ b/cfb/cfbglblt8.c
>@@ -121,7 +121,7 @@ static void cfbPolyGlyphBlt8Clipped(
> extern void		cfbStippleStack (), cfbStippleStackTE ();
> #endif
> 
>-void
>+_X_EXPORT void
> cfbPolyGlyphBlt8 (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
>     DrawablePtr pDrawable;
>     GCPtr	pGC;
>diff --git a/cfb/cfbigblt8.c b/cfb/cfbigblt8.c
>index 1f1ce6f..f7f85eb 100644
>--- a/cfb/cfbigblt8.c
>+++ b/cfb/cfbigblt8.c
>@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
> #include	"cfbmskbits.h"
> #include	"cfb8bit.h"
> 
>-void
>+_X_EXPORT void
> cfbImageGlyphBlt8 (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
>     DrawablePtr	    pDrawable;
>     GCPtr	    pGC;
>diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c
>index 396e1fc..8e9ab7c 100644
>--- a/cfb/cfbimage.c
>+++ b/cfb/cfbimage.c
>@@ -61,7 +61,7 @@ SOFTWARE.
> #include "servermd.h"
> #include "mi.h"
> 
>-void
>+_X_EXPORT void
> cfbPutImage(pDraw, pGC, depth, x, y, w, h, leftPad, format, pImage)
>     DrawablePtr pDraw;
>     GCPtr	pGC;
>@@ -129,7 +129,7 @@ cfbPutImage(pDraw, pGC, depth, x, y, w, h, leftPad, format, pImage)
>     }
> }
> 
>-void
>+_X_EXPORT void
> cfbGetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine)
>     DrawablePtr pDrawable;
>     int		sx, sy, w, h;
>diff --git a/cfb/cfbline.c b/cfb/cfbline.c
>index 84c089a..334d728 100644
>--- a/cfb/cfbline.c
>+++ b/cfb/cfbline.c
>@@ -91,7 +91,7 @@ actual clipping.
> 
> */
> 
>-void
>+_X_EXPORT void
> #ifdef POLYSEGMENT
> cfbSegmentSS (pDrawable, pGC, nseg, pSeg)
>     DrawablePtr	pDrawable;
>@@ -458,7 +458,7 @@ cfbLineSS (pDrawable, pGC, mode, npt, pptInit)
>  * Draw dashed 1-pixel lines.
>  */
> 
>-void
>+_X_EXPORT void
> #ifdef POLYSEGMENT
> cfbSegmentSD (pDrawable, pGC, nseg, pSeg)
>     DrawablePtr	pDrawable;
>diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c
>index ce0bcb2..fed3cde 100644
>--- a/cfb/cfbply1rct.c
>+++ b/cfb/cfbply1rct.c
>@@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
> #include "cfbmskbits.h"
> #include "cfbrrop.h"
> 
>-void
>+_X_EXPORT void
> RROP_NAME(cfbFillPoly1Rect) (pDrawable, pGC, shape, mode, count, ptsIn)
>     DrawablePtr	pDrawable;
>     GCPtr	pGC;
>diff --git a/cfb/cfbpolypnt.c b/cfb/cfbpolypnt.c
>index 06a768e..921f0e9 100644
>--- a/cfb/cfbpolypnt.c
>+++ b/cfb/cfbpolypnt.c
>@@ -65,7 +65,7 @@ in this Software without prior written authorization from The Open Group.
> # include "cfbrrop24.h"
> #endif
> 
>-void
>+_X_EXPORT void
> cfbPolyPoint(pDrawable, pGC, mode, npt, pptInit)
>     DrawablePtr pDrawable;
>     GCPtr pGC;
>diff --git a/cfb/cfbpush8.c b/cfb/cfbpush8.c
>index 857ec94..b157eda 100644
>--- a/cfb/cfbpush8.c
>+++ b/cfb/cfbpush8.c
>@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
> #define MFB_CONSTS_ONLY
> #include	"maskbits.h"
> 
>-void
>+_X_EXPORT void
> cfbPushPixels8 (pGC, pBitmap, pDrawable, dx, dy, xOrg, yOrg)
>     GCPtr	pGC;
>     PixmapPtr	pBitmap;
>diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c
>index ffd8138..b494c21 100644
>--- a/cfb/cfbrrop.c
>+++ b/cfb/cfbrrop.c
>@@ -123,7 +123,7 @@ in this Software without prior written authorization from The Open Group.
>  *  xor	    0	1 (src)	    0	0 (0)	    0	1 (src)	    0	0 (0)
>  */
> 
>-int
>+_X_EXPORT int
> cfbReduceRasterOp (rop, fg, pm, andp, xorp)
>     int		    rop;
>     CfbBits   fg, pm;
>diff --git a/cfb/cfbsetsp.c b/cfb/cfbsetsp.c
>index a000fd9..c556b2b 100644
>--- a/cfb/cfbsetsp.c
>+++ b/cfb/cfbsetsp.c
>@@ -185,7 +185,7 @@ cfbSetScanline(y, xOrigin, xStart, xEnd, psrc, alu, pdstBase, widthDst, planemas
>  * Source bit lines are server scanline padded so that they always begin
>  * on a word boundary.
>  */ 
>-void
>+_X_EXPORT void
> cfbSetSpans(pDrawable, pGC, pcharsrc, ppt, pwidth, nspans, fSorted)
>     DrawablePtr		pDrawable;
>     GCPtr		pGC;
>diff --git a/cfb/cfbsolid.c b/cfb/cfbsolid.c
>index 6b8238d..8b100e0 100644
>--- a/cfb/cfbsolid.c
>+++ b/cfb/cfbsolid.c
>@@ -776,7 +776,7 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
>     RROP_UNDECLARE
> }
> 
>-void
>+_X_EXPORT void
> RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
>     DrawablePtr pDrawable;
>     GCPtr	pGC;
>diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c
>index 5b8879e..92df3f3 100644
>--- a/cfb/cfbzerarc.c
>+++ b/cfb/cfbzerarc.c
>@@ -273,7 +273,7 @@ RROP_NAME(cfbZeroArcSS8)(
>     RROP_UNDECLARE
> }
> 
>-void
>+_X_EXPORT void
> RROP_NAME (cfbZeroPolyArcSS8) (pDraw, pGC, narcs, parcs)
>     register DrawablePtr	pDraw;
>     GCPtr	pGC;
>diff --git a/dix/globals.c b/dix/globals.c
>index 7f95eab..8f727df 100644
>--- a/dix/globals.c
>+++ b/dix/globals.c
>@@ -130,7 +130,7 @@ int  logoScreenSaver = DEFAULT_LOGO_SCREEN_SAVER;
> #endif
> 
> #ifdef SCREENSAVER
>-Bool screenSaverSuspended = FALSE;
>+_X_EXPORT Bool screenSaverSuspended = FALSE;
> #endif
> 
> char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
>diff --git a/dix/registry.c b/dix/registry.c
>index 10fa21f..a5ce399 100644
>--- a/dix/registry.c
>+++ b/dix/registry.c
>@@ -255,7 +255,7 @@ LookupErrorName(int error)
>     return errors[error] ? errors[error] : XREGISTRY_UNKNOWN;
> }
> 
>-const char *
>+_X_EXPORT const char *
> LookupResourceName(RESTYPE resource)
> {
>     resource &= TypeMask;
>diff --git a/dix/resource.c b/dix/resource.c
>index f318de3..7d92080 100644
>--- a/dix/resource.c
>+++ b/dix/resource.c
>@@ -698,7 +698,7 @@ FindAllClientResources(
> }
> 
> 
>-pointer
>+_X_EXPORT pointer
> LookupClientResourceComplex(
>     ClientPtr client,
>     RESTYPE type,
>diff --git a/exa/exa.c b/exa/exa.c
>index cbe66e8..d33f3a9 100644
>--- a/exa/exa.c
>+++ b/exa/exa.c
>@@ -64,7 +64,7 @@ ExaGetPixmapAddress(PixmapPtr p)
>  * support for having multiple card-accessible offscreen, such as an AGP memory
>  * pool alongside the framebuffer pool.
>  */
>-unsigned long
>+_X_EXPORT unsigned long
> exaGetPixmapOffset(PixmapPtr pPix)
> {
>     ExaScreenPriv (pPix->drawable.pScreen);
>@@ -73,7 +73,7 @@ exaGetPixmapOffset(PixmapPtr pPix)
> 	    (unsigned long)pExaScr->info->memoryBase);
> }
> 
>-void *
>+_X_EXPORT void *
> exaGetPixmapDriverPrivate(PixmapPtr pPix)
> {
>     ExaPixmapPriv(pPix);
>@@ -87,7 +87,7 @@ exaGetPixmapDriverPrivate(PixmapPtr pPix)
>  * This is a helper to make driver code more obvious, due to the rather obscure
>  * naming of the pitch field in the pixmap.
>  */
>-unsigned long
>+_X_EXPORT unsigned long
> exaGetPixmapPitch(PixmapPtr pPix)
> {
>     return pPix->devKind;
>@@ -718,7 +718,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
>  *
>  * @return a newly allocated, zero-filled driver structure
>  */
>-ExaDriverPtr
>+_X_EXPORT ExaDriverPtr
> exaDriverAlloc(void)
> {
>     return xcalloc(1, sizeof(ExaDriverRec));
>@@ -734,7 +734,7 @@ exaDriverAlloc(void)
>  *
>  * @return TRUE if EXA was successfully initialized.
>  */
>-Bool
>+_X_EXPORT Bool
> exaDriverInit (ScreenPtr		pScreen,
>                ExaDriverPtr	pScreenInfo)
> {
>@@ -941,7 +941,7 @@ exaDriverInit (ScreenPtr		pScreen,
>  *
>  * @param pScreen screen being torn down.
>  */
>-void
>+_X_EXPORT void
> exaDriverFini (ScreenPtr pScreen)
> {
>     /*right now does nothing*/
>@@ -958,7 +958,7 @@ exaDriverFini (ScreenPtr pScreen)
>  * driver MarkSync() callback, the return value of which may be used to do partial
>  * synchronization with the hardware in the future.
>  */
>-void exaMarkSync(ScreenPtr pScreen)
>+_X_EXPORT void exaMarkSync(ScreenPtr pScreen)
> {
>     ExaScreenPriv(pScreen);
> 
>@@ -977,7 +977,7 @@ void exaMarkSync(ScreenPtr pScreen)
>  * It should always be called before relying on the framebuffer contents
>  * reflecting previous drawing, from a CPU perspective.
>  */
>-void exaWaitSync(ScreenPtr pScreen)
>+_X_EXPORT void exaWaitSync(ScreenPtr pScreen)
> {
>     ExaScreenPriv(pScreen);
> 
>diff --git a/exa/exa_migration.c b/exa/exa_migration.c
>index d3646b0..ff3e4e4 100644
>--- a/exa/exa_migration.c
>+++ b/exa/exa_migration.c
>@@ -349,7 +349,7 @@ exaDoMoveInPixmap (ExaMigrationPtr migrate)
>     pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
> }
> 
>-void
>+_X_EXPORT void
> exaMoveInPixmap (PixmapPtr pPixmap)
> {
>     static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE,
>diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c
>index c666b00..19060e5 100644
>--- a/exa/exa_offscreen.c
>+++ b/exa/exa_offscreen.c
>@@ -90,7 +90,7 @@ ExaOffscreenKickOut (ScreenPtr pScreen, ExaOffscreenArea *area)
>  * requested version 2.1 or newer behavior.  In that case, the save callback is
>  * still called.
>  */
>-ExaOffscreenArea *
>+_X_EXPORT ExaOffscreenArea *
> exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
>                    Bool locked,
>                    ExaOffscreenSaveProc save,
>@@ -335,7 +335,7 @@ ExaOffscreenSwapIn (ScreenPtr pScreen)
>  * many drivers that could otherwise handle the lack of FB access while
>  * swapped out.
>  */
>-void
>+_X_EXPORT void
> exaEnableDisableFBAccess (int index, Bool enable)
> {
>     ScreenPtr pScreen = screenInfo.screens[index];
>@@ -382,7 +382,7 @@ ExaOffscreenMerge (ExaOffscreenArea *area)
>  * @return pointer to the newly freed area. This behavior should not be relied
>  * on.
>  */
>-ExaOffscreenArea *
>+_X_EXPORT ExaOffscreenArea *
> exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area)
> {
>     ExaScreenPriv(pScreen);
>@@ -422,7 +422,7 @@ exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area)
>     return area;
> }
> 
>-void
>+_X_EXPORT void
> ExaOffscreenMarkUsed (PixmapPtr pPixmap)
> {
>     ExaPixmapPriv (pPixmap);
>diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
>index c55ef03..45fe07a 100644
>--- a/exa/exa_unaccel.c
>+++ b/exa/exa_unaccel.c
>@@ -356,7 +356,7 @@ ExaCheckComposite (CARD8      op,
>  *
>  * XXX This really belongs in fb, so it can be aware of tiling and etc.
>  */
>-CARD32
>+_X_EXPORT CARD32
> exaGetPixmapFirstPixel (PixmapPtr pPixmap)
> {
>     CARD32 pixel;
>diff --git a/fb/fb24_32.c b/fb/fb24_32.c
>index a03726b..f016618 100644
>--- a/fb/fb24_32.c
>+++ b/fb/fb24_32.c
>@@ -532,7 +532,7 @@ fb24_32CopyMtoN (DrawablePtr pSrcDrawable,
>     fbFinishAccess (pDstDrawable);
> }
> 
>-PixmapPtr
>+_X_EXPORT PixmapPtr
> fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
> {
>     ScreenPtr	pScreen = pOldTile->drawable.pScreen;
>diff --git a/fb/fballpriv.c b/fb/fballpriv.c
>index 68cb2e4..d6c872f 100644
>--- a/fb/fballpriv.c
>+++ b/fb/fballpriv.c
>@@ -34,13 +34,13 @@ DevPrivateKey fbGetScreenPrivateKey(void)
> }
> #endif
> static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKey;
>-DevPrivateKey fbGetGCPrivateKey(void)
>+_X_EXPORT DevPrivateKey fbGetGCPrivateKey(void)
> {
>     return fbGCPrivateKey;
> }
> #ifndef FB_NO_WINDOW_PIXMAPS
> static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKey;
>-DevPrivateKey fbGetWinPrivateKey(void)
>+_X_EXPORT DevPrivateKey fbGetWinPrivateKey(void)
> {
>     return fbWinPrivateKey;
> }
>diff --git a/fb/fbbits.h b/fb/fbbits.h
>index 44991f1..9fd2b88 100644
>--- a/fb/fbbits.h
>+++ b/fb/fbbits.h
>@@ -557,7 +557,7 @@ ARC (FbBits	*dst,
> # define WRITE4(d,n,fg)	    (WRITE2(d,n,fg), WRITE2(d,(n)+2,fg))
> #endif
> 
>-void
>+_X_EXPORT void
> GLYPH (FbBits	*dstBits,
>    FbStride	dstStride,
>    int	dstBpp,
>diff --git a/fb/fbblt.c b/fb/fbblt.c
>index 38271c0..afa8974 100644
>--- a/fb/fbblt.c
>+++ b/fb/fbblt.c
>@@ -873,7 +873,7 @@ fbSetBltOdd (FbStip	*stip,
> }
> #endif
> 
>-void
>+_X_EXPORT void
> fbBltStip (FbStip   *src,
> 	   FbStride srcStride,	    /* in FbStip units, not FbBits units */
> 	   int	    srcX,
>diff --git a/fb/fbcmap.c b/fb/fbcmap.c
>index c29a513..0ec0e85 100644
>--- a/fb/fbcmap.c
>+++ b/fb/fbcmap.c
>@@ -278,7 +278,7 @@ fbExpandDirectColors (ColormapPtr   pmap,
>     return nresult;
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbCreateDefColormap(ScreenPtr pScreen)
> {
>     unsigned short	zero = 0, ones = 0xFFFF;
>diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c
>index 188decd..0747972 100644
>--- a/fb/fbcmap_mi.c
>+++ b/fb/fbcmap_mi.c
>@@ -85,7 +85,7 @@ fbExpandDirectColors (ColormapPtr   pmap,
>     return miExpandDirectColors(pmap, ndef, indefs, outdefs);
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbCreateDefColormap(ScreenPtr pScreen)
> {
>     return miCreateDefColormap(pScreen);
>diff --git a/fb/fbcopy.c b/fb/fbcopy.c
>index b8b0b6a..29cd6b3 100644
>--- a/fb/fbcopy.c
>+++ b/fb/fbcopy.c
>@@ -28,7 +28,7 @@
> 
> #include "fb.h"
> 
>-void
>+_X_EXPORT void
> fbCopyNtoN (DrawablePtr	pSrcDrawable,
> 	    DrawablePtr	pDstDrawable,
> 	    GCPtr	pGC,
>@@ -289,7 +289,7 @@ fbCopyNto1 (DrawablePtr	pSrcDrawable,
>     }
> }
> 
>-void
>+_X_EXPORT void
> fbCopyRegion (DrawablePtr   pSrcDrawable,
> 	      DrawablePtr   pDstDrawable,
> 	      GCPtr	    pGC,
>@@ -407,7 +407,7 @@ fbCopyRegion (DrawablePtr   pSrcDrawable,
> 	xfree (pboxNew2);
> }
> 
>-RegionPtr
>+_X_EXPORT RegionPtr
> fbDoCopy (DrawablePtr	pSrcDrawable,
> 	  DrawablePtr	pDstDrawable,
> 	  GCPtr		pGC,
>@@ -612,7 +612,7 @@ fbDoCopy (DrawablePtr	pSrcDrawable,
>     return prgnExposed;
> }
> 
>-RegionPtr
>+_X_EXPORT RegionPtr
> fbCopyArea (DrawablePtr	pSrcDrawable,
> 	    DrawablePtr	pDstDrawable,
> 	    GCPtr	pGC,
>@@ -635,7 +635,7 @@ fbCopyArea (DrawablePtr	pSrcDrawable,
> 		     widthSrc, heightSrc, xOut, yOut, copy, 0, 0);
> }
> 
>-RegionPtr
>+_X_EXPORT RegionPtr
> fbCopyPlane (DrawablePtr    pSrcDrawable,
> 	     DrawablePtr    pDstDrawable,
> 	     GCPtr	    pGC,
>diff --git a/fb/fbfill.c b/fb/fbfill.c
>index 831b1ce..75a77d1 100644
>--- a/fb/fbfill.c
>+++ b/fb/fbfill.c
>@@ -165,7 +165,7 @@ fbFill (DrawablePtr pDrawable,
>     fbFinishAccess (pDrawable);
> }
> 
>-void
>+_X_EXPORT void
> fbSolidBoxClipped (DrawablePtr	pDrawable,
> 		   RegionPtr	pClip,
> 		   int		x1,
>diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c
>index 4e4edb3..a22e648 100644
>--- a/fb/fbfillrect.c
>+++ b/fb/fbfillrect.c
>@@ -26,7 +26,7 @@
> 
> #include "fb.h"
> 
>-void
>+_X_EXPORT void
> fbPolyFillRect(DrawablePtr  pDrawable, 
> 	       GCPtr	    pGC, 
> 	       int	    nrect,
>diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c
>index 5d21472..60a7075 100644
>--- a/fb/fbfillsp.c
>+++ b/fb/fbfillsp.c
>@@ -26,7 +26,7 @@
> 
> #include "fb.h"
> 
>-void
>+_X_EXPORT void
> fbFillSpans (DrawablePtr    pDrawable,
> 	     GCPtr	    pGC,
> 	     int	    n,
>diff --git a/fb/fbgc.c b/fb/fbgc.c
>index fda391b..c5b6a23 100644
>--- a/fb/fbgc.c
>+++ b/fb/fbgc.c
>@@ -61,7 +61,7 @@ const GCOps	fbGCOps = {
>     fbPushPixels
> };
> 
>-Bool
>+_X_EXPORT Bool
> fbCreateGC(GCPtr pGC)
> {
>     pGC->clientClip = NULL;
>@@ -84,7 +84,7 @@ fbCreateGC(GCPtr pGC)
> /*
>  * Pad pixmap to FB_UNIT bits wide
>  */
>-void
>+_X_EXPORT void
> fbPadPixmap (PixmapPtr pPixmap)
> {
>     int	    width;
>@@ -193,7 +193,7 @@ fbCanEvenStipple (PixmapPtr pStipple, int bpp)
>     return TRUE;
> }
> 
>-void
>+_X_EXPORT void
> fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
> {
>     FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);
>diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c
>index 6402c6c..b939d69 100644
>--- a/fb/fbgetsp.c
>+++ b/fb/fbgetsp.c
>@@ -26,7 +26,7 @@
> 
> #include "fb.h"
> 
>-void
>+_X_EXPORT void
> fbGetSpans(DrawablePtr	pDrawable, 
> 	   int		wMax, 
> 	   DDXPointPtr	ppt, 
>diff --git a/fb/fbglyph.c b/fb/fbglyph.c
>index 2c19b74..23dd9a2 100644
>--- a/fb/fbglyph.c
>+++ b/fb/fbglyph.c
>@@ -30,8 +30,8 @@
> #include	"dixfontstr.h"
> 
> #define dummyScreen screenInfo.screens[0]
>-      
>-Bool
>+
>+_X_EXPORT Bool
> fbGlyphIn (RegionPtr	pRegion,
> 	   int		x,
> 	   int		y,
>@@ -129,7 +129,7 @@ fbGlyphIn (RegionPtr	pRegion,
> #define CASE(a,b,c,d)	(a | (b << 1) | (c << 2) | (d << 3))
> #endif
> 
>-void
>+_X_EXPORT void
> fbGlyph24 (FbBits   *dstBits,
> 	   FbStride dstStride,
> 	   int	    dstBpp,
>@@ -253,7 +253,7 @@ fbGlyph24 (FbBits   *dstBits,
> #endif
> #endif
> 
>-void
>+_X_EXPORT void
> fbPolyGlyphBlt (DrawablePtr	pDrawable,
> 		GCPtr		pGC,
> 		int		x, 
>@@ -343,7 +343,7 @@ fbPolyGlyphBlt (DrawablePtr	pDrawable,
> }
> 
> 
>-void
>+_X_EXPORT void
> fbImageGlyphBlt (DrawablePtr	pDrawable,
> 		 GCPtr		pGC,
> 		 int		x, 
>diff --git a/fb/fbimage.c b/fb/fbimage.c
>index 2b9ac27..c65feaa 100644
>--- a/fb/fbimage.c
>+++ b/fb/fbimage.c
>@@ -28,7 +28,7 @@
> 
> #include "fb.h"
> 
>-void
>+_X_EXPORT void
> fbPutImage (DrawablePtr	pDrawable,
> 	    GCPtr	pGC,
> 	    int		depth,
>@@ -171,8 +171,8 @@ fbPutZImage (DrawablePtr	pDrawable,
> 
>     fbFinishAccess (pDrawable);
> }
>-	     
>-void
>+
>+_X_EXPORT void
> fbPutXYImage (DrawablePtr	pDrawable,
> 	      RegionPtr		pClip,
> 	      FbBits		fg,
>@@ -281,7 +281,7 @@ fbPutXYImage (DrawablePtr	pDrawable,
>     fbFinishAccess (pDrawable);
> }
> 
>-void
>+_X_EXPORT void
> fbGetImage (DrawablePtr	    pDrawable,
> 	    int		    x,
> 	    int		    y,
>diff --git a/fb/fbline.c b/fb/fbline.c
>index 2cee123..c406163 100644
>--- a/fb/fbline.c
>+++ b/fb/fbline.c
>@@ -102,7 +102,7 @@ fbFixCoordModePrevious (int	    npt,
>     }
> }
> 
>-void
>+_X_EXPORT void
> fbPolyLine (DrawablePtr	pDrawable,
> 	    GCPtr	pGC,
> 	    int		mode,
>@@ -140,7 +140,7 @@ fbPolyLine (DrawablePtr	pDrawable,
>     (*line) (pDrawable, pGC, mode, npt, ppt);
> }
> 
>-void
>+_X_EXPORT void
> fbPolySegment (DrawablePtr  pDrawable,
> 	       GCPtr	    pGC,
> 	       int	    nseg,
>diff --git a/fb/fboverlay.c b/fb/fboverlay.c
>index f9f7c52..7ab391f 100644
>--- a/fb/fboverlay.c
>+++ b/fb/fboverlay.c
>@@ -35,7 +35,7 @@
> 
> static DevPrivateKey fbOverlayScreenPrivateKey = &fbOverlayScreenPrivateKey;
> 
>-DevPrivateKey fbOverlayGetScreenPrivateKey(void)
>+_X_EXPORT DevPrivateKey fbOverlayGetScreenPrivateKey(void)
> {
>     return fbOverlayScreenPrivateKey;
> }
>@@ -277,7 +277,7 @@ fbOverlayWindowExposures (WindowPtr	pWin,
>     miWindowExposures(pWin, prgn, other_exposed);
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbOverlaySetupScreen(ScreenPtr	pScreen,
> 		     pointer	pbits1,
> 		     pointer	pbits2,
>@@ -324,7 +324,7 @@ fb24_32OverlayCreateScreenResources(ScreenPtr pScreen)
>     return retval;
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbOverlayFinishScreenInit(ScreenPtr	pScreen,
> 			  pointer	pbits1,
> 			  pointer	pbits2,
>diff --git a/fb/fbpict.c b/fb/fbpict.c
>index 85b5171..c71c583 100644
>--- a/fb/fbpict.c
>+++ b/fb/fbpict.c
>@@ -143,7 +143,7 @@ fbWalkCompositeRegion (CARD8 op,
>     REGION_UNINIT (pDst->pDrawable->pScreen, &region);
> }
> 
>-void
>+_X_EXPORT void
> fbComposite (CARD8      op,
> 	     PicturePtr pSrc,
> 	     PicturePtr pMask,
>@@ -447,7 +447,7 @@ free_pixman_pict (PicturePtr pict, pixman_image_t *image)
> 	fbFinishAccess (pict->pDrawable);
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
> {
> 
>diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
>index 311da9e..64752c4 100644
>--- a/fb/fbpixmap.c
>+++ b/fb/fbpixmap.c
>@@ -82,7 +82,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
>     return pPixmap;
> }
> 
>-PixmapPtr
>+_X_EXPORT PixmapPtr
> fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
> 		unsigned usage_hint)
> {
>@@ -95,7 +95,7 @@ fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
>     return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, usage_hint);
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbDestroyPixmap (PixmapPtr pPixmap)
> {
>     if(--pPixmap->refcnt)
>@@ -137,7 +137,7 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&			\
>  * Then it coalesces the current line with the previous if they have boxes
>  * at the same X coordinates.
>  */
>-RegionPtr
>+_X_EXPORT RegionPtr
> fbPixmapToRegion(PixmapPtr pPix)
> {
>     register RegionPtr	pReg;
>diff --git a/fb/fbpoint.c b/fb/fbpoint.c
>index c0ea8ba..53e4279 100644
>--- a/fb/fbpoint.c
>+++ b/fb/fbpoint.c
>@@ -107,7 +107,7 @@ fbDots (FbBits	    *dstOrig,
>     }
> }
> 
>-void
>+_X_EXPORT void
> fbPolyPoint (DrawablePtr    pDrawable,
> 	     GCPtr	    pGC,
> 	     int	    mode,
>diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c
>index 06cf159..372ad6b 100644
>--- a/fb/fbpseudocolor.c
>+++ b/fb/fbpseudocolor.c
>@@ -1012,7 +1012,7 @@ xxWakeupHandler (pointer data, int i, pointer LastSelectMask)
> {
> }
> 
>-Bool
>+_X_EXPORT Bool
> xxSetup(ScreenPtr pScreen, int myDepth, int baseDepth, char* addr, xxSyncFunc sync)
> {
>     xxScrPrivPtr	pScrPriv;
>diff --git a/fb/fbpush.c b/fb/fbpush.c
>index 891572f..be841c5 100644
>--- a/fb/fbpush.c
>+++ b/fb/fbpush.c
>@@ -222,8 +222,8 @@ fbPushImage (DrawablePtr    pDrawable,
> 		    y2 - y1);
>     }
> }
>-	     
>-void
>+
>+_X_EXPORT void
> fbPushPixels (GCPtr	    pGC,
> 	      PixmapPtr	    pBitmap,
> 	      DrawablePtr   pDrawable,
>diff --git a/fb/fbscreen.c b/fb/fbscreen.c
>index 12b19e4..0ff70b0 100644
>--- a/fb/fbscreen.c
>+++ b/fb/fbscreen.c
>@@ -97,7 +97,7 @@ _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap)
> #endif
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbSetupScreen(ScreenPtr	pScreen, 
> 	      pointer	pbits,		/* pointer to screen bitmap */
> 	      int	xsize, 		/* in pixels */
>@@ -279,7 +279,7 @@ wfbScreenInit(ScreenPtr		pScreen,
>     return TRUE;
> }
> #else
>-Bool
>+_X_EXPORT Bool
> fbScreenInit(ScreenPtr	pScreen,
> 	     pointer	pbits,
> 	     int	xsize,
>diff --git a/fb/fbseg.c b/fb/fbseg.c
>index 80ce740..0d42fa9 100644
>--- a/fb/fbseg.c
>+++ b/fb/fbseg.c
>@@ -575,7 +575,7 @@ fbSelectBres (DrawablePtr   pDrawable,
>     return bres;
> }
> 
>-void
>+_X_EXPORT void
> fbBres (DrawablePtr	pDrawable,
> 	GCPtr		pGC,
> 	int		dashOffset,
>diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c
>index 227ba4c..f64622a 100644
>--- a/fb/fbsetsp.c
>+++ b/fb/fbsetsp.c
>@@ -26,7 +26,7 @@
> 
> #include "fb.h"
> 
>-void
>+_X_EXPORT void
> fbSetSpans (DrawablePtr	    pDrawable,
> 	    GCPtr	    pGC,
> 	    char	    *src,
>diff --git a/fb/fbutil.c b/fb/fbutil.c
>index 5e23297..dfe769f 100644
>--- a/fb/fbutil.c
>+++ b/fb/fbutil.c
>@@ -26,7 +26,7 @@
> 
> #include "fb.h"
> 
>-FbBits
>+_X_EXPORT FbBits
> fbReplicatePixel (Pixel p, int bpp)
> {
>     FbBits  b = p;
>diff --git a/fb/fbwindow.c b/fb/fbwindow.c
>index f6fe8aa..88a49c6 100644
>--- a/fb/fbwindow.c
>+++ b/fb/fbwindow.c
>@@ -150,7 +150,7 @@ fbCopyWindow(WindowPtr	    pWin,
>     fbValidateDrawable (&pWin->drawable);
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
> {
>     PixmapPtr	pPixmap;
>diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c
>index 3ea1b4d..1720319 100644
>--- a/hw/xfree86/common/xf86Cursor.c
>+++ b/hw/xfree86/common/xf86Cursor.c
>@@ -135,7 +135,7 @@ xf86InitViewport(ScrnInfoPtr pScr)
>  *      Scroll the visual part of the screen so the pointer is visible.
>  */
> 
>-void
>+_X_EXPORT void
> xf86SetViewport(ScreenPtr pScreen, int x, int y)
> {
>   ScrnInfoPtr   pScr = XF86SCRNINFO(pScreen);
>@@ -199,7 +199,7 @@ xf86LockZoom(ScreenPtr pScreen, Bool lock)
>  *	set a new mode.
>  */
> 
>-Bool
>+_X_EXPORT Bool
> xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
> {
>   ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
>@@ -800,7 +800,7 @@ xf86InitOrigins(void)
>     }
> }
> 
>-void
>+_X_EXPORT void
> xf86ReconfigureLayout(void)
> {
>     int i;
>diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
>index 0dc42c6..bee95ba 100644
>--- a/hw/xfree86/common/xf86Globals.c
>+++ b/hw/xfree86/common/xf86Globals.c
>@@ -94,7 +94,7 @@ InputInfoPtr xf86InputDevs = NULL;
> 
> /* Globals that video drivers may not access */
> 
>-xf86InfoRec xf86Info = {
>+_X_EXPORT xf86InfoRec xf86Info = {
> 	-1,		/* consoleFd */
> 	-1,		/* vtno */
> 	FALSE,		/* vtSysreq */
>@@ -201,7 +201,7 @@ Bool xf86MiscModInDevAllowNonLocal = FALSE;
> #endif
> RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
> _X_EXPORT Bool xf86inSuspend = FALSE;
>-Bool xorgHWAccess = FALSE;
>+_X_EXPORT Bool xorgHWAccess = FALSE;
> 
> struct pci_slot_match xf86IsolateDevice = {
>     PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0
>diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
>index 7483e20..feadb81 100644
>--- a/hw/xfree86/common/xf86xv.c
>+++ b/hw/xfree86/common/xf86xv.c
>@@ -114,9 +114,9 @@ static DevPrivateKey XF86XVWindowKey = &XF86XVWindowKey;
> DevPrivateKey XF86XvScreenKey;
> static unsigned long PortResource = 0;
> 
>-DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL;
>-unsigned long (*XvGetRTPortProc)(void) = NULL;
>-int (*XvScreenInitProc)(ScreenPtr) = NULL;
>+_X_EXPORT DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL;
>+_X_EXPORT unsigned long (*XvGetRTPortProc)(void) = NULL;
>+_X_EXPORT int (*XvScreenInitProc)(ScreenPtr) = NULL;
> 
> #define GET_XV_SCREEN(pScreen) \
>     ((XvScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XF86XvScreenKey))
>diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c
>index 02125df..8ff469f 100644
>--- a/hw/xfree86/ddc/ddcProperty.c
>+++ b/hw/xfree86/ddc/ddcProperty.c
>@@ -103,7 +103,7 @@ addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
>     }
> }
> 
>-Bool
>+_X_EXPORT Bool
> xf86SetDDCproperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
> {
>     if (!pScrn || !pScrn->monitor || !DDC)
>diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
>index 21391dd..db669f0 100644
>--- a/hw/xfree86/ddc/interpret_edid.c
>+++ b/hw/xfree86/ddc/interpret_edid.c
>@@ -87,7 +87,7 @@ handle_edid_quirks(xf86MonPtr m)
>     }
> }
> 
>-xf86MonPtr
>+_X_EXPORT xf86MonPtr
> xf86InterpretEDID(int scrnIndex, Uchar *block)
> {
>     xf86MonPtr m;
>diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
>index f5442ad..1f1dc6e 100644
>--- a/hw/xfree86/ddc/print_edid.c
>+++ b/hw/xfree86/ddc/print_edid.c
>@@ -459,7 +459,7 @@ print_number_sections(int scrnIndex, int num)
> 		   num);
> }
> 
>-xf86MonPtr
>+_X_EXPORT xf86MonPtr
> xf86PrintEDID(xf86MonPtr m)
> {
>     CARD16 i, j;
>diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
>index 28e2ead..c10fe2f 100644
>--- a/hw/xfree86/ddc/xf86DDC.c
>+++ b/hw/xfree86/ddc/xf86DDC.c
>@@ -67,7 +67,7 @@ static const OptionInfoRec DDCOptions[] = {
>  * @return pointer to a new xf86MonPtr containing the EDID information.
>  * @return NULL if no monitor attached or failure to interpret the EDID.
>  */
>-xf86MonPtr 
>+_X_EXPORT xf86MonPtr
> xf86DoEDID_DDC1(
>     int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed, 
>     unsigned int (*DDC1Read)(ScrnInfoPtr)
>@@ -118,7 +118,7 @@ xf86DoEDID_DDC1(
>  * @return pointer to a new xf86MonPtr containing the EDID information.
>  * @return NULL if no monitor attached or failure to interpret the EDID.
>  */
>-xf86MonPtr
>+_X_EXPORT xf86MonPtr
> xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)
> {
>     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
>diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
>index b736c6a..ab65850 100644
>--- a/hw/xfree86/dri/dri.c
>+++ b/hw/xfree86/dri/dri.c
>@@ -300,7 +300,7 @@ DRIOpenDRMMaster(ScrnInfoPtr pScrn,
> }
> 
> 
>-Bool
>+_X_EXPORT Bool
> DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
> {
>     DRIScreenPrivPtr    pDRIPriv;
>@@ -581,7 +581,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
>     return TRUE;
> }
> 
>-Bool
>+_X_EXPORT Bool
> DRIFinishScreenInit(ScreenPtr pScreen)
> {
>     DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);
>@@ -624,7 +624,7 @@ DRIFinishScreenInit(ScreenPtr pScreen)
>     return TRUE;
> }
> 
>-void
>+_X_EXPORT void
> DRICloseScreen(ScreenPtr pScreen)
> {
>     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
>@@ -793,7 +793,7 @@ DRIReset(void)
>      */
> }
> 
>-Bool
>+_X_EXPORT Bool
> DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)
> {
>     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
>@@ -806,7 +806,7 @@ DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)
>     return TRUE;
> }
> 
>-Bool
>+_X_EXPORT Bool
> DRIOpenConnection(ScreenPtr pScreen, drm_handle_t * hSAREA, char **busIdString)
> {
>     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
>@@ -817,7 +817,7 @@ DRIOpenConnection(ScreenPtr pScreen, drm_handle_t * hSAREA, char **busIdString)
>     return TRUE;
> }
> 
>-Bool
>+_X_EXPORT Bool
> DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic)
> {
>     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
>@@ -826,13 +826,13 @@ DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic)
>     return TRUE;
> }
> 
>-Bool
>+_X_EXPORT Bool
> DRICloseConnection(ScreenPtr pScreen)
> {
>     return TRUE;
> }
> 
>-Bool
>+_X_EXPORT Bool
> DRIGetClientDriverName(ScreenPtr pScreen,
>                        int *ddxDriverMajorVersion,
>                        int *ddxDriverMinorVersion,
>@@ -995,7 +995,7 @@ DRIDestroyDummyContext(ScreenPtr pScreen, Bool hasCtxPriv)
>     pDRIPriv->dummyCtxPriv = NULL;
> }
> 
>-Bool
>+_X_EXPORT Bool
> DRICreateContext(ScreenPtr pScreen, VisualPtr visual,
>                  XID context, drm_context_t * pHWContext)
> {
>@@ -1031,7 +1031,7 @@ DRICreateContext(ScreenPtr pScreen, VisualPtr visual,
>     return TRUE;
> }
> 
>-Bool
>+_X_EXPORT Bool
> DRIDestroyContext(ScreenPtr pScreen, XID context)
> {
>     FreeResourceByType(context, DRIContextPrivResType, FALSE);
>@@ -1214,7 +1214,7 @@ DRIDecreaseNumberVisible(ScreenPtr pScreen)
>     DRIDriverClipNotify(pScreen);
> }
> 
>-Bool
>+_X_EXPORT Bool
> DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,
> 		  drm_drawable_t * hHWDrawable)
> {
>@@ -1326,7 +1326,7 @@ DRIDestroyDrawableCB(pointer value, XID id, pointer data)
>     return FALSE;
> }
> 
>-Bool
>+_X_EXPORT Bool
> DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable)
> {
>     if (pDrawable->type == DRAWABLE_WINDOW) {
>@@ -1367,7 +1367,7 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
>     }
> }
> 
>-Bool
>+_X_EXPORT Bool
> DRIGetDrawableInfo(ScreenPtr pScreen,
>                    DrawablePtr pDrawable,
>                    unsigned int* index,
>@@ -1539,7 +1539,7 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
>     return TRUE;
> }
> 
>-Bool
>+_X_EXPORT Bool
> DRIGetDeviceInfo(ScreenPtr pScreen,
>                  drm_handle_t * hFrameBuffer,
>                  int* fbOrigin,
>@@ -1560,7 +1560,7 @@ DRIGetDeviceInfo(ScreenPtr pScreen,
>     return TRUE;
> }
> 
>-DRIInfoPtr
>+_X_EXPORT DRIInfoPtr
> DRICreateInfoRec(void)
> {
>     DRIInfoPtr inforec = (DRIInfoPtr)xcalloc(1, sizeof(DRIInfoRec));
>@@ -1586,7 +1586,7 @@ DRICreateInfoRec(void)
>     return inforec;
> }
> 
>-void
>+_X_EXPORT void
> DRIDestroyInfoRec(DRIInfoPtr DRIInfo)
> {
>     if (DRIInfo->busIdString) xfree(DRIInfo->busIdString);
>@@ -1594,7 +1594,7 @@ DRIDestroyInfoRec(DRIInfoPtr DRIInfo)
> }
> 
> 
>-void
>+_X_EXPORT void
> DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask)
> {
>     int i;
>@@ -1610,7 +1610,7 @@ DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask)
>     }
> }
> 
>-void
>+_X_EXPORT void
> DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
> {
>     int i;
>@@ -2137,7 +2137,7 @@ DRIClipNotify(WindowPtr pWin, int dx, int dy)
>     }
> }
> 
>-CARD32
>+_X_EXPORT CARD32
> DRIGetDrawableIndex(WindowPtr pWin)
> {
>     ScreenPtr pScreen = pWin->drawable.pScreen;
>@@ -2171,7 +2171,7 @@ DRIPrintDrawableLock(ScreenPtr pScreen, char *msg)
>     ErrorF("%s: %d\n", msg,  pDRIPriv->pSAREA->drawable_lock.lock);
> }
> 
>-void
>+_X_EXPORT void
> DRILock(ScreenPtr pScreen, int flags)
> {
>     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
>@@ -2192,7 +2192,7 @@ DRILock(ScreenPtr pScreen, int flags)
>     (*pDRIPriv->pLockRefCount)++;
> }
> 
>-void
>+_X_EXPORT void
> DRIUnlock(ScreenPtr pScreen)
> {
>     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
>@@ -2217,7 +2217,7 @@ DRIUnlock(ScreenPtr pScreen)
>         DRM_UNLOCK(pDRIPriv->drmFD, pDRIPriv->pLSAREA, pDRIPriv->myContext);
> }
> 
>-void *
>+_X_EXPORT void *
> DRIGetSAREAPrivate(ScreenPtr pScreen)
> {
>     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
>@@ -2226,7 +2226,7 @@ DRIGetSAREAPrivate(ScreenPtr pScreen)
>     return (void *)(((char*)pDRIPriv->pSAREA)+sizeof(XF86DRISAREARec));
> }
> 
>-drm_context_t
>+_X_EXPORT drm_context_t
> DRIGetContext(ScreenPtr pScreen)
> {
>     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
>@@ -2235,7 +2235,7 @@ DRIGetContext(ScreenPtr pScreen)
>     return pDRIPriv->myContext;
> }
> 
>-void
>+_X_EXPORT void
> DRIGetTexOffsetFuncs(ScreenPtr pScreen,
> 		     DRITexOffsetStartProcPtr *texOffsetStartFunc,
> 		     DRITexOffsetFinishProcPtr *texOffsetFinishFunc)
>@@ -2259,7 +2259,7 @@ DRIGetWrappedFuncs(ScreenPtr pScreen)
> }
> 
> /* note that this returns the library version, not the protocol version */
>-void
>+_X_EXPORT void
> DRIQueryVersion(int *majorVersion,
>                 int *minorVersion,
>                 int *patchVersion)
>@@ -2330,7 +2330,7 @@ DRIAdjustFrame(int scrnIndex, int x, int y, int flags)
>  * REGION_VALIDATE on it, or better yet, save a copy first.
>  */
> 
>-void
>+_X_EXPORT void
> DRIMoveBuffersHelper(
>    ScreenPtr pScreen, 
>    int dx,
>@@ -2396,7 +2396,7 @@ DRIMoveBuffersHelper(
> 
> }
> 
>-char *
>+_X_EXPORT char *
> DRICreatePCIBusID(const struct pci_device * dev)
> {
>     char *busID;
>diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
>index a1f6748..3ace246 100644
>--- a/hw/xfree86/fbdevhw/fbdevhw.c
>+++ b/hw/xfree86/fbdevhw/fbdevhw.c
>@@ -141,7 +141,7 @@ fbdevHWGetRec(ScrnInfoPtr pScrn)
> 	return TRUE;
> }
> 
>-void
>+_X_EXPORT void
> fbdevHWFreeRec(ScrnInfoPtr pScrn)
> {
> 	if (fbdevHWPrivateIndex < 0)
>@@ -432,7 +432,7 @@ fbdev_open(int scrnIndex, char *dev, char** namep)
> 
> /* -------------------------------------------------------------------- */
> 
>-Bool
>+_X_EXPORT Bool
> fbdevHWProbe(struct pci_device * pPci, char *device,char **namep)
> {
> 	int fd;
>@@ -448,7 +448,7 @@ fbdevHWProbe(struct pci_device * pPci, char *device,char **namep)
> 	return TRUE;
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device)
> {
> 	fbdevHWPtr fPtr;
>@@ -496,14 +496,14 @@ fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device)
> 	return TRUE;
> }
> 
>-char*
>+_X_EXPORT char*
> fbdevHWGetName(ScrnInfoPtr pScrn)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
> 	return fPtr->fix.id;
> }
> 
>-int
>+_X_EXPORT int
> fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
>@@ -519,7 +519,7 @@ fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp)
> 		return fPtr->var.bits_per_pixel;
> }
> 
>-int
>+_X_EXPORT int
> fbdevHWGetLineLength(ScrnInfoPtr pScrn)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
>@@ -530,14 +530,14 @@ fbdevHWGetLineLength(ScrnInfoPtr pScrn)
> 		return fPtr->var.xres_virtual*fPtr->var.bits_per_pixel/8;
> }
> 
>-int
>+_X_EXPORT int
> fbdevHWGetType(ScrnInfoPtr pScrn)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
> 	return fPtr->fix.type;
> }
> 
>-int
>+_X_EXPORT int
> fbdevHWGetVidmem(ScrnInfoPtr pScrn)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
>@@ -588,7 +588,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool check)
> 	return TRUE;
> }
> 
>-void
>+_X_EXPORT void
> fbdevHWSetVideoModes(ScrnInfoPtr pScrn)
> {
> 	char **modename;
>@@ -646,7 +646,7 @@ fbdevHWGetBuildinMode(ScrnInfoPtr pScrn)
> 	return &fPtr->buildin;
> }
> 
>-void
>+_X_EXPORT void
> fbdevHWUseBuildinMode(ScrnInfoPtr pScrn)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
>@@ -672,7 +672,7 @@ calculateFbmem_len(fbdevHWPtr fPtr)
> }
> 
> 
>-void*
>+_X_EXPORT void*
> fbdevHWMapVidmem(ScrnInfoPtr pScrn)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
>@@ -698,7 +698,7 @@ fbdevHWMapVidmem(ScrnInfoPtr pScrn)
> 	return fPtr->fbmem;
> }
> 
>-int
>+_X_EXPORT int
> fbdevHWLinearOffset(ScrnInfoPtr pScrn)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
>@@ -707,7 +707,7 @@ fbdevHWLinearOffset(ScrnInfoPtr pScrn)
> 	return fPtr->fboff;
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbdevHWUnmapVidmem(ScrnInfoPtr pScrn)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
>@@ -722,7 +722,7 @@ fbdevHWUnmapVidmem(ScrnInfoPtr pScrn)
> 	return TRUE;
> }
> 
>-void*
>+_X_EXPORT void*
> fbdevHWMapMMIO(ScrnInfoPtr pScrn)
> {
> 	unsigned int mmio_off;
>@@ -755,7 +755,7 @@ fbdevHWMapMMIO(ScrnInfoPtr pScrn)
> 	return fPtr->mmio;
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbdevHWUnmapMMIO(ScrnInfoPtr pScrn)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
>@@ -773,7 +773,7 @@ fbdevHWUnmapMMIO(ScrnInfoPtr pScrn)
> 
> /* -------------------------------------------------------------------- */
> 
>-Bool
>+_X_EXPORT Bool
> fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
> {	
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
>@@ -816,7 +816,7 @@ fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
> /* video mode save/restore                                              */
> 
> /* TODO: colormap */
>-void
>+_X_EXPORT void
> fbdevHWSave(ScrnInfoPtr pScrn)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
>@@ -827,7 +827,7 @@ fbdevHWSave(ScrnInfoPtr pScrn)
> 			   "FBIOGET_VSCREENINFO: %s\n", strerror(errno));
> }
> 
>-void
>+_X_EXPORT void
> fbdevHWRestore(ScrnInfoPtr pScrn)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
>@@ -841,7 +841,7 @@ fbdevHWRestore(ScrnInfoPtr pScrn)
> /* -------------------------------------------------------------------- */
> /* callback for xf86HandleColormaps                                     */
> 
>-void
>+_X_EXPORT void
> fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
> 		 LOCO *colors, VisualPtr pVisual)
> {
>@@ -886,7 +886,7 @@ fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
> 	return MODE_OK;
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
> {
> 	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
>@@ -899,7 +899,7 @@ fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
> 	return TRUE;
> }
> 
>-void
>+_X_EXPORT void
> fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags)
> {
> 	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
>@@ -917,7 +917,7 @@ fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags)
> 			   "FBIOPAN_DISPLAY: %s\n", strerror(errno));
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbdevHWEnterVT(int scrnIndex, int flags)
> {
> 	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
>@@ -929,7 +929,7 @@ fbdevHWEnterVT(int scrnIndex, int flags)
> 	return TRUE;
> }
> 
>-void
>+_X_EXPORT void
> fbdevHWLeaveVT(int scrnIndex, int flags)
> {
> 	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
>@@ -938,7 +938,7 @@ fbdevHWLeaveVT(int scrnIndex, int flags)
> 	fbdevHWRestore(pScrn);
> }
> 
>-void
>+_X_EXPORT void
> fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
> {
> 	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
>@@ -970,7 +970,7 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
> 			   "FBIOBLANK: %s\n", strerror(errno));
> }
> 
>-Bool
>+_X_EXPORT Bool
> fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
> {
> 	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
>@@ -992,26 +992,26 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
> 	return TRUE;
> }
> 
>-xf86SwitchModeProc *
>+_X_EXPORT xf86SwitchModeProc *
> fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; }
> 
>-xf86AdjustFrameProc *
>+_X_EXPORT xf86AdjustFrameProc *
> fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; }
> 
>-xf86EnterVTProc *
>+_X_EXPORT xf86EnterVTProc *
> fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; }
> 
>-xf86LeaveVTProc *
>+_X_EXPORT xf86LeaveVTProc *
> fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; }
> 
>-xf86ValidModeProc *
>+_X_EXPORT xf86ValidModeProc *
> fbdevHWValidModeWeak(void) { return fbdevHWValidMode; }
> 
>-xf86DPMSSetProc *
>+_X_EXPORT xf86DPMSSetProc *
> fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; }
> 
>-xf86LoadPaletteProc *
>+_X_EXPORT xf86LoadPaletteProc *
> fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; }
> 
>-SaveScreenProcPtr
>+_X_EXPORT SaveScreenProcPtr
> fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; }
>diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c
>index 7581ebd..62b315d 100644
>--- a/hw/xfree86/i2c/xf86i2c.c
>+++ b/hw/xfree86/i2c/xf86i2c.c
>@@ -484,7 +484,7 @@ xf86I2CReadStatus(I2CDevPtr d, I2CByte *pbyte)
> /* Read a byte from one of the registers determined by its sub-address.
>  */
> 
>-Bool
>+_X_EXPORT Bool
> xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte)
> {
>     return xf86I2CWriteRead(d, &subaddr, 1, pbyte, 1);
>@@ -494,7 +494,7 @@ xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte)
>  * sub-address of the first register.
>  */
> 
>-Bool
>+_X_EXPORT Bool
> xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte, int n)
> {
>     return xf86I2CWriteRead(d, &subaddr, 1, pbyte, n);
>@@ -519,7 +519,7 @@ xf86I2CReadWord(I2CDevPtr d, I2CByte subaddr, unsigned short *pword)
> /* Write a byte to one of the registers determined by its sub-address.
>  */
> 
>-Bool
>+_X_EXPORT Bool
> xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr, I2CByte byte)
> {
>     I2CByte wb[2];
>@@ -579,7 +579,7 @@ xf86I2CWriteWord(I2CDevPtr d, I2CByte subaddr, unsigned short word)
>  * remain uninitialized.
>  */
> 
>-Bool
>+_X_EXPORT Bool
> xf86I2CWriteVec(I2CDevPtr d, I2CByte *vec, int nValues)
> {
>     I2CBusPtr b = d->pI2CBus;
>@@ -629,7 +629,7 @@ xf86CreateI2CDevRec(void)
>  * you should set <unalloc> to free it.
>  */
> 
>-void
>+_X_EXPORT void
> xf86DestroyI2CDevRec(I2CDevPtr d, Bool unalloc) 
> {
>     if (d) {
>@@ -690,7 +690,7 @@ xf86I2CDevInit(I2CDevPtr d)
>     return TRUE;
> }
> 
>-I2CDevPtr
>+_X_EXPORT I2CDevPtr
> xf86I2CFindDev(I2CBusPtr b, I2CSlaveAddr addr) 
> {
>     I2CDevPtr d;
>@@ -846,7 +846,7 @@ xf86I2CBusInit(I2CBusPtr b)
>     return TRUE;
> }
> 
>-I2CBusPtr
>+_X_EXPORT I2CBusPtr
> xf86I2CFindBus(int scrnIndex, char *name) 
> {
>     I2CBusPtr p;
>@@ -864,7 +864,7 @@ xf86I2CFindBus(int scrnIndex, char *name)
>  * Return an array of I2CBusPtr's related to a screen.  The caller is
>  * responsible for freeing the array.
>  */
>-int
>+_X_EXPORT int
> xf86I2CGetScreenBuses(int scrnIndex, I2CBusPtr **pppI2CBus)
> {
>     I2CBusPtr pI2CBus;
>diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
>index a30dee1..8ffaf65 100644
>--- a/hw/xfree86/int10/generic.c
>+++ b/hw/xfree86/int10/generic.c
>@@ -116,7 +116,7 @@ read_legacy_video_BIOS(struct pci_device *dev, unsigned char *Buf)
> }
> 
> 
>-xf86Int10InfoPtr
>+_X_EXPORT xf86Int10InfoPtr
> xf86ExtendedInitInt10(int entityIndex, int Flags)
> {
>     xf86Int10InfoPtr pInt;
>@@ -341,7 +341,7 @@ MapCurrentInt10(xf86Int10InfoPtr pInt)
>     return TRUE;
> }
> 
>-void
>+_X_EXPORT void
> xf86FreeInt10(xf86Int10InfoPtr pInt)
> {
>     if (!pInt)
>@@ -358,7 +358,7 @@ xf86FreeInt10(xf86Int10InfoPtr pInt)
>     xfree(pInt);
> }
> 
>-void *
>+_X_EXPORT void *
> xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off)
> {
>     int pagesize = getpagesize();
>@@ -386,7 +386,7 @@ xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off)
>     return (char *)INTPriv(pInt)->base + *off;
> }
> 
>-void
>+_X_EXPORT void
> xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
> {
>     int pagesize = getpagesize();
>@@ -499,7 +499,7 @@ write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
>     V_ADDR_WB(addr + 3, val >> 24);
> }
> 
>-pointer
>+_X_EXPORT pointer
> xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
> {
>     return V_ADDR(addr);
>diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
>index 9daff22..bae95b1 100644
>--- a/hw/xfree86/int10/helper_exec.c
>+++ b/hw/xfree86/int10/helper_exec.c
>@@ -733,7 +733,7 @@ xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save)
> }
> #endif
> 
>-xf86Int10InfoPtr
>+_X_EXPORT xf86Int10InfoPtr
> xf86InitInt10(int entityIndex)
> {
>     return xf86ExtendedInitInt10(entityIndex, 0);
>diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c
>index 58b6578..80b619b 100644
>--- a/hw/xfree86/int10/stub.c
>+++ b/hw/xfree86/int10/stub.c
>@@ -13,13 +13,13 @@
> #define _INT10_PRIVATE
> #include "xf86int10.h"
> 
>-xf86Int10InfoPtr
>+_X_EXPORT xf86Int10InfoPtr
> xf86InitInt10(int entityIndex)
> {
>     return xf86ExtendedInitInt10(entityIndex, 0);
> }
> 
>-xf86Int10InfoPtr
>+_X_EXPORT xf86Int10InfoPtr
> xf86ExtendedInitInt10(int entityIndex, int Flags)
> {
>     return NULL;
>@@ -31,20 +31,20 @@ MapCurrentInt10(xf86Int10InfoPtr pInt)
>     return FALSE;
> }
> 
>-void
>+_X_EXPORT void
> xf86FreeInt10(xf86Int10InfoPtr pInt)
> {
>     return;
> }
> 
>-void *
>+_X_EXPORT void *
> xf86Int10AllocPages(xf86Int10InfoPtr pInt,int num, int *off)
> {
>     *off = 0;
>     return NULL;
> }
> 
>-void
>+_X_EXPORT void
> xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
> {
>     return;
>@@ -56,13 +56,13 @@ xf86Int10ExecSetup(xf86Int10InfoPtr pInt)
>     return FALSE;
> }
> 
>-void
>+_X_EXPORT void
> xf86ExecX86int10(xf86Int10InfoPtr pInt)
> {
>     return;
> }
> 
>-pointer
>+_X_EXPORT pointer
> xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
> {
>     return 0;
>diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
>index 83663b0..7f5b9d4 100644
>--- a/hw/xfree86/int10/xf86x86emu.c
>+++ b/hw/xfree86/int10/xf86x86emu.c
>@@ -28,7 +28,7 @@ x86emu_do_int(int num)
>     }
> }
> 
>-void
>+_X_EXPORT void
> xf86ExecX86int10(xf86Int10InfoPtr pInt)
> {
>     int sig = setup_int(pInt);
>diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
>index 39e84e6..32e5976 100644
>--- a/hw/xfree86/modes/xf86Crtc.c
>+++ b/hw/xfree86/modes/xf86Crtc.c
>@@ -53,7 +53,7 @@
>  * Initialize xf86CrtcConfig structure
>  */
> 
>-int xf86CrtcConfigPrivateIndex = -1;
>+_X_EXPORT int xf86CrtcConfigPrivateIndex = -1;
> 
> _X_EXPORT void
> xf86CrtcConfigInit (ScrnInfoPtr scrn,
>diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
>index 5748434..1bbe99d 100644
>--- a/hw/xfree86/os-support/linux/int10/linux.c
>+++ b/hw/xfree86/os-support/linux/int10/linux.c
>@@ -71,7 +71,7 @@ static Int10LinuxSubModuleState int10LinuxLoadSubModule(ScrnInfoPtr pScrn);
> 
> #endif /* DoSubModules */
> 
>-xf86Int10InfoPtr
>+_X_EXPORT xf86Int10InfoPtr
> xf86ExtendedInitInt10(int entityIndex, int Flags)
> {
>     xf86Int10InfoPtr pInt = NULL;
>@@ -384,7 +384,7 @@ MapCurrentInt10(xf86Int10InfoPtr pInt)
>     return TRUE;
> }
> 
>-void
>+_X_EXPORT void
> xf86FreeInt10(xf86Int10InfoPtr pInt)
> {
>     if (!pInt)
>@@ -413,7 +413,7 @@ xf86FreeInt10(xf86Int10InfoPtr pInt)
>     xfree(pInt);
> }
> 
>-void *
>+_X_EXPORT void *
> xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off)
> {
>     int pagesize = getpagesize();
>@@ -442,7 +442,7 @@ xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off)
>     return ((linuxInt10Priv*)pInt->private)->base + ((i + 1) * pagesize);
> }
> 
>-void
>+_X_EXPORT void
> xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
> {
>     int pagesize = getpagesize();
>@@ -491,7 +491,7 @@ void write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
>     *((CARD32 *)(memType) addr) = val;
> }
> 
>-pointer
>+_X_EXPORT pointer
> xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
> {
>     if (addr < V_RAM)
>diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
>index 9412b07..cceda06 100644
>--- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
>+++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
>@@ -255,7 +255,7 @@ do_vm86(xf86Int10InfoPtr pInt)
>     return 1;
> }
> 
>-void
>+_X_EXPORT void
> xf86ExecX86int10(xf86Int10InfoPtr pInt)
> {
>     int sig = setup_int(pInt);
>diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c
>index 5aa27a1..dc1bcd5 100644
>--- a/hw/xfree86/ramdac/BT.c
>+++ b/hw/xfree86/ramdac/BT.c
>@@ -65,7 +65,7 @@ BTramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
> 	    ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC)(pScrn, i);
> }
> 
>-RamDacHelperRecPtr
>+_X_EXPORT RamDacHelperRecPtr
> BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/*, RamDacRecPtr ramdacPtr*/)
> {
>     RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
>diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c
>index 2d9fe4d..a789b69 100644
>--- a/hw/xfree86/ramdac/IBM.c
>+++ b/hw/xfree86/ramdac/IBM.c
>@@ -39,7 +39,7 @@
> 
> #define INITIALFREQERR 100000
> 
>-unsigned long
>+_X_EXPORT unsigned long
> IBMramdac640CalculateMNPCForClock(
>     unsigned long RefClock,	/* In 100Hz units */
>     unsigned long ReqClock,	/* In 100Hz units */
>@@ -105,7 +105,7 @@ IBMramdac640CalculateMNPCForClock(
>   return (ActualClock);
> }
> 
>-unsigned long
>+_X_EXPORT unsigned long
> IBMramdac526CalculateMNPCForClock(
>     unsigned long RefClock,	/* In 100Hz units */
>     unsigned long ReqClock,	/* In 100Hz units */
>@@ -225,7 +225,7 @@ IBMramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
> 	    ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC)(pScrn, i);
> }
> 
>-RamDacHelperRecPtr
>+_X_EXPORT RamDacHelperRecPtr
> IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/* , RamDacRecPtr ramdacPtr*/)
> {
>     RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
>@@ -376,7 +376,7 @@ IBMramdac526SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)
>     }
> }
> 
>-IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void) {
>+_X_EXPORT IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void) {
>     return IBMramdac526SetBpp;
> }
> 
>diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c
>index f421fc3..c77121b 100644
>--- a/hw/xfree86/ramdac/TI.c
>+++ b/hw/xfree86/ramdac/TI.c
>@@ -42,7 +42,7 @@
> #define TI_MIN_VCO_FREQ  110000
> #define TI_MAX_VCO_FREQ  220000
> 
>-unsigned long
>+_X_EXPORT unsigned long
> TIramdacCalculateMNPForClock(
>     unsigned long RefClock,	/* In 100Hz units */
>     unsigned long ReqClock,	/* In 100Hz units */
>@@ -280,7 +280,7 @@ TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
>     TISAVE(TIDAC_ind_curs_ctrl);
> }
> 
>-RamDacHelperRecPtr
>+_X_EXPORT RamDacHelperRecPtr
> TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs)
> {
>     RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
>@@ -714,6 +714,6 @@ void TIramdacLoadPalette(
> }
> }
> 
>-TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void) {
>+_X_EXPORT TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void) {
>     return TIramdacLoadPalette;
> }
>diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
>index 5b1ce5e..825aabc 100644
>--- a/hw/xfree86/ramdac/xf86Cursor.c
>+++ b/hw/xfree86/ramdac/xf86Cursor.c
>@@ -37,7 +37,7 @@ static void xf86CursorQueryBestSize(int, unsigned short*, unsigned short*,
> static void xf86CursorEnableDisableFBAccess(int, Bool);
> static Bool xf86CursorSwitchMode(int, DisplayModePtr,int);
> 
>-Bool
>+_X_EXPORT Bool
> xf86InitCursor(
>    ScreenPtr pScreen,
>    xf86CursorInfoPtr infoPtr
>@@ -359,7 +359,7 @@ xf86CursorMoveCursor(ScreenPtr pScreen, int x, int y)
> 	xf86MoveCursor(pScreen, x, y);
> }
> 
>-void
>+_X_EXPORT void
> xf86ForceHWCursor (ScreenPtr pScreen, Bool on)
> {
>     xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
>@@ -390,13 +390,13 @@ xf86ForceHWCursor (ScreenPtr pScreen, Bool on)
>     }
> }
> 
>-xf86CursorInfoPtr
>+_X_EXPORT xf86CursorInfoPtr
> xf86CreateCursorInfoRec(void)
> {
>     return xcalloc(1, sizeof(xf86CursorInfoRec));
> }
> 
>-void
>+_X_EXPORT void
> xf86DestroyCursorInfoRec(xf86CursorInfoPtr infoPtr)
> {
>     xfree(infoPtr);
>diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c
>index 1dd3daf..d838c56 100644
>--- a/hw/xfree86/ramdac/xf86RamDac.c
>+++ b/hw/xfree86/ramdac/xf86RamDac.c
>@@ -36,8 +36,8 @@
> int RamDacHWPrivateIndex = -1;
> int RamDacScreenPrivateIndex = -1;
> 
>-RamDacRecPtr
>-RamDacCreateInfoRec()
>+_X_EXPORT RamDacRecPtr
>+RamDacCreateInfoRec(void)
> {
>     RamDacRecPtr infoRec;
> 
>@@ -46,8 +46,8 @@ RamDacCreateInfoRec()
>     return infoRec;
> }
> 
>-RamDacHelperRecPtr
>-RamDacHelperCreateInfoRec()
>+_X_EXPORT RamDacHelperRecPtr
>+RamDacHelperCreateInfoRec(void)
> {
>     RamDacHelperRecPtr infoRec;
> 
>@@ -56,7 +56,7 @@ RamDacHelperCreateInfoRec()
>     return infoRec;
> }
> 
>-void 
>+_X_EXPORT void
> RamDacDestroyInfoRec(RamDacRecPtr infoRec)
> {
>     xfree(infoRec);
>@@ -68,7 +68,7 @@ RamDacHelperDestroyInfoRec(RamDacHelperRecPtr infoRec)
>     xfree(infoRec);
> }
> 
>-Bool
>+_X_EXPORT Bool
> RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPriv)
> {
>     RamDacScreenRecPtr ramdacScrPtr;
>@@ -116,7 +116,7 @@ RamDacGetRec(ScrnInfoPtr scrp)
>     return TRUE;
> }
> 
>-void
>+_X_EXPORT void
> RamDacFreeRec(ScrnInfoPtr pScrn)
> {
>     RamDacHWRecPtr ramdacHWPtr;
>@@ -141,8 +141,8 @@ RamDacFreeRec(ScrnInfoPtr pScrn)
>     ramdacScrPtr = NULL;
> }
> 
>-int
>-RamDacGetHWIndex()
>+_X_EXPORT int
>+RamDacGetHWIndex(void)
> {
>     return RamDacHWPrivateIndex;
> }
>diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c
>index 600fe3f..f4fdb18 100644
>--- a/hw/xfree86/ramdac/xf86RamDacCmap.c
>+++ b/hw/xfree86/ramdac/xf86RamDacCmap.c
>@@ -58,7 +58,7 @@ RamDacLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
>     }
> }
> 
>-Bool
>+_X_EXPORT Bool
> RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits,
> 		      unsigned int flags)
> {
>diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c
>index 74beefb..2993609 100644
>--- a/hw/xfree86/shadowfb/shadow.c
>+++ b/hw/xfree86/shadowfb/shadow.c
>@@ -157,7 +157,7 @@ static DevPrivateKey ShadowGCKey = &ShadowGCKey;
> 
> 
> 
>-Bool
>+_X_EXPORT Bool
> ShadowFBInit2 (
>     ScreenPtr		pScreen,
>     RefreshAreaFuncPtr  preRefreshArea,
>@@ -210,7 +210,7 @@ ShadowFBInit2 (
>     return TRUE;
> }
> 
>-Bool
>+_X_EXPORT Bool
> ShadowFBInit (
>     ScreenPtr		pScreen,
>     RefreshAreaFuncPtr  refreshArea
>diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
>index 8af1727..34ccda8 100644
>--- a/hw/xfree86/vbe/vbe.c
>+++ b/hw/xfree86/vbe/vbe.c
>@@ -41,13 +41,13 @@ static Bool vbeProbeDDC(vbeInfoPtr pVbe);
> 
> static const char vbeVersionString[] = "VBE2";
> 
>-vbeInfoPtr
>+_X_EXPORT vbeInfoPtr
> VBEInit(xf86Int10InfoPtr pInt, int entityIndex)
> {
>     return VBEExtendedInit(pInt, entityIndex, 0);
> }
> 
>-vbeInfoPtr
>+_X_EXPORT vbeInfoPtr
> VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags)
> {
>     int RealOff;
>@@ -155,7 +155,7 @@ VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags)
>     return NULL;
> }
> 
>-void
>+_X_EXPORT void
> vbeFree(vbeInfoPtr pVbe)
> {
>     if (!pVbe)
>@@ -306,7 +306,7 @@ vbeReadEDID(vbeInfoPtr pVbe)
>     return tmp;
> }
> 
>-xf86MonPtr
>+_X_EXPORT xf86MonPtr
> vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule)
> {
>     xf86MonPtr    pMonitor;
>@@ -339,7 +339,7 @@ vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule)
> #define GET_UNALIGNED2(x) \
>             ((*(CARD16*)(x)) | (*(((CARD16*)(x) + 1))) << 16)
> 
>-VbeInfoBlock *
>+_X_EXPORT VbeInfoBlock *
> VBEGetVBEInfo(vbeInfoPtr pVbe)
> {
>     VbeInfoBlock *block = NULL;
>@@ -423,7 +423,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
>     return (block);
> }
> 
>-void
>+_X_EXPORT void
> VBEFreeVBEInfo(VbeInfoBlock *block)
> {
>     xfree(block->OEMStringPtr);
>@@ -436,7 +436,7 @@ VBEFreeVBEInfo(VbeInfoBlock *block)
>     xfree(block);
> }
> 
>-Bool
>+_X_EXPORT Bool
> VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock *block)
> {
>     /*
>@@ -474,7 +474,7 @@ VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock *block)
>     return (R16(pVbe->pInt10->ax) == 0x4f);
> }
> 
>-Bool
>+_X_EXPORT Bool
> VBEGetVBEMode(vbeInfoPtr pVbe, int *mode)
> {
>     /*
>@@ -501,7 +501,7 @@ VBEGetVBEMode(vbeInfoPtr pVbe, int *mode)
>     return (FALSE);
> }
> 
>-VbeModeInfoBlock *
>+_X_EXPORT VbeModeInfoBlock *
> VBEGetModeInfo(vbeInfoPtr pVbe, int mode)
> {
>     VbeModeInfoBlock *block = NULL;
>@@ -596,13 +596,13 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode)
>     return (block);
> }
> 
>-void
>+_X_EXPORT void
> VBEFreeModeInfo(VbeModeInfoBlock *block)
> {
>     xfree(block);
> }
> 
>-Bool
>+_X_EXPORT Bool
> VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function, 
> 	       pointer *memory, int *size, int *real_mode_pages)
> {
>@@ -701,7 +701,7 @@ VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function,
>     return TRUE;
> }
> 
>-Bool
>+_X_EXPORT Bool
> VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window)
> {
>     /*
>@@ -723,7 +723,7 @@ VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window)
>     return (TRUE);
> }
> 
>-Bool
>+_X_EXPORT Bool
> VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command,
> 				int width, int *pixels, int *bytes, int *max)
> {
>@@ -771,7 +771,7 @@ VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command,
>     return (TRUE);
> }
> 
>-Bool
>+_X_EXPORT Bool
> VBESetDisplayStart(vbeInfoPtr pVbe, int x, int y, Bool wait_retrace)
> {
>     pVbe->pInt10->num = 0x10;
>@@ -804,7 +804,7 @@ VBEGetDisplayStart(vbeInfoPtr pVbe, int *x, int *y)
>     return (TRUE);
> }
> 
>-int
>+_X_EXPORT int
> VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits)
> {
>     /*
>@@ -834,7 +834,7 @@ VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits)
>     return (bits != 0 ? bits : (pVbe->pInt10->bx >> 8) & 0x00ff);
> }
> 
>-CARD32 *
>+_X_EXPORT CARD32 *
> VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set, int first, int num,
> 		      CARD32 *data, Bool secondary, Bool wait_retrace)
> {
>@@ -1041,7 +1041,7 @@ VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int clock)
>     return (pVbe->pInt10->cx);
> }
> 
>-Bool
>+_X_EXPORT Bool
> VBEDPMSSet(vbeInfoPtr pVbe, int mode)
> {
>     /*
>diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c
>index fb730a7..78cca5a 100644
>--- a/hw/xfree86/vbe/vbeModes.c
>+++ b/hw/xfree86/vbe/vbeModes.c
>@@ -89,7 +89,7 @@ GetDepthFlag(vbeInfoPtr pVbe, int id)
> /*
>  * Find supported mode depths.
>  */
>-int
>+_X_EXPORT int
> VBEFindSupportedDepths(vbeInfoPtr pVbe, VbeInfoBlock *vbe, int *flags24,
> 			int modeTypes)
> {
>@@ -269,7 +269,7 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int id,
>  * list.
>  */
> 
>-DisplayModePtr
>+_X_EXPORT DisplayModePtr
> VBEGetModePool(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe,
> 	       int modeTypes)
> {
>@@ -343,7 +343,7 @@ VBEGetModePool(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe,
>     return modePool;
> }
> 
>-void
>+_X_EXPORT void
> VBESetModeNames(DisplayModePtr pMode)
> {
>     if (!pMode)
>@@ -369,7 +369,7 @@ VBESetModeNames(DisplayModePtr pMode)
>  * parameters for each BIOS mode.  Note: This is only supported in
>  * VBE version 3.0 or later.
>  */
>-void
>+_X_EXPORT void
> VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe)
> {
>     DisplayModePtr pMode;
>@@ -432,7 +432,7 @@ VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe)
> /*
>  * These wrappers are to allow (temporary) funtionality divergences.
>  */
>-int
>+_X_EXPORT int
> VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
> 		  char **modeNames, ClockRangePtr clockRanges,
> 		  int *linePitches, int minPitch, int maxPitch, int pitchInc,
>@@ -445,7 +445,7 @@ VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
> 			     apertureSize, strategy);
> }
> 
>-void
>+_X_EXPORT void
> VBEPrintModes(ScrnInfoPtr scrp)
> {
>     xf86PrintModes(scrp);
>diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c
>index ccbd195..c28e118 100644
>--- a/hw/xfree86/vgahw/vgaHW.c
>+++ b/hw/xfree86/vgahw/vgaHW.c
>@@ -328,7 +328,7 @@ stdWriteEnable(vgaHWPtr hwp, CARD8 value)
>     outb(hwp->PIOOffset + VGA_ENABLE, value);
> }
> 
>-void
>+_X_EXPORT void
> vgaHWSetStdFuncs(vgaHWPtr hwp)
> {
>     hwp->writeCrtc		= stdWriteCrtc;
>@@ -535,7 +535,7 @@ mmioWriteEnable(vgaHWPtr hwp, CARD8 value)
>     moutb(VGA_ENABLE, value);
> }
> 
>-void
>+_X_EXPORT void
> vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset)
> {
>     hwp->writeCrtc		= mmioWriteCrtc;
>@@ -571,7 +571,7 @@ vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset)
>  *	Protect VGA registers and memory from corruption during loads.
>  */
> 
>-void
>+_X_EXPORT void
> vgaHWProtect(ScrnInfoPtr pScrn, Bool on)
> {
>   vgaHWPtr hwp = VGAHWPTR(pScrn);
>@@ -604,7 +604,7 @@ vgaHWProtect(ScrnInfoPtr pScrn, Bool on)
>   }
> }
> 
>-vgaHWProtectProc *vgaHWProtectWeak(void) {
>+_X_EXPORT vgaHWProtectProc *vgaHWProtectWeak(void) {
>   return vgaHWProtect;
> }
> 
>@@ -612,7 +612,7 @@ vgaHWProtectProc *vgaHWProtectWeak(void) {
>  * vgaHWBlankScreen -- blank the screen.
>  */
> 
>-void
>+_X_EXPORT void
> vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on)
> {
>   vgaHWPtr hwp = VGAHWPTR(pScrn);
>@@ -631,7 +631,7 @@ vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on)
>   vgaHWSeqReset(hwp, FALSE);
> }
> 
>-vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) {
>+_X_EXPORT vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) {
>   return vgaHWBlankScreen;
> }  
> 
>@@ -639,7 +639,7 @@ vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) {
>  * vgaHWSaveScreen -- blank the screen.
>  */
> 
>-Bool
>+_X_EXPORT Bool
> vgaHWSaveScreen(ScreenPtr pScreen, int mode)
> {
>    ScrnInfoPtr pScrn = NULL;
>@@ -670,7 +670,7 @@ vgaHWSaveScreen(ScreenPtr pScreen, int mode)
>  * for this function must be written.
>  */
> 
>-void
>+_X_EXPORT void
> vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags)
> {
>   unsigned char seq1 = 0, crtc17 = 0;
>@@ -715,7 +715,7 @@ vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags)
>  *      perform a sequencer reset.
>  */
> 
>-void
>+_X_EXPORT void
> vgaHWSeqReset(vgaHWPtr hwp, Bool start)
> {
>   if (start)
>@@ -897,7 +897,7 @@ vgaHWRestoreColormap(ScrnInfoPtr scrninfp, vgaRegPtr restore)
>  *      restore the VGA state
>  */
> 
>-void
>+_X_EXPORT void
> vgaHWRestore(ScrnInfoPtr scrninfp, vgaRegPtr restore, int flags)
> {
>     if (flags & VGA_SR_MODE)
>@@ -1156,7 +1156,7 @@ vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save)
>  *      save the current VGA state
>  */
> 
>-void
>+_X_EXPORT void
> vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save, int flags)
> {
>     if (save == NULL)
>@@ -1179,7 +1179,7 @@ vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save, int flags)
>  *      Return FALSE on failure.
>  */
> 
>-Bool
>+_X_EXPORT Bool
> vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
> {
>     unsigned int       i;
>@@ -1399,7 +1399,7 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
>      * --  TSI @ UQV,  1998.08.21
>      */
> 
>-CARD32
>+_X_EXPORT CARD32
> vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, 
> 	       unsigned int Flags)
> {
>@@ -1440,7 +1440,7 @@ vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits,
>      * very first scanline in a double- or multi-scanned mode.  This last case
>      * needs further investigation.
>      */
>-CARD32
>+_X_EXPORT CARD32
> vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, 
> 	       unsigned int Flags)
> {
>@@ -1532,7 +1532,7 @@ vgaHWAllocRegs(vgaRegPtr regp)
> }
> 
> 
>-Bool
>+_X_EXPORT Bool
> vgaHWAllocDefaultRegs(vgaRegPtr regp)
> {
>     regp->numCRTC = VGA_NUM_CRTC;
>@@ -1614,7 +1614,7 @@ vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer,
> }
> 
> 
>-Bool
>+_X_EXPORT Bool
> vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src)
> {
>     vgaHWFreeRegs(dst);
>@@ -1633,7 +1633,7 @@ vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src)
> }
> 
> 
>-Bool
>+_X_EXPORT Bool
> vgaHWGetHWRec(ScrnInfoPtr scrp)
> {
>     vgaRegPtr regp;
>@@ -1729,7 +1729,7 @@ vgaHWGetHWRec(ScrnInfoPtr scrp)
> }
> 
> 
>-void
>+_X_EXPORT void
> vgaHWFreeHWRec(ScrnInfoPtr scrp)
> {
>     if (vgaHWPrivateIndex >= 0) {
>@@ -1751,7 +1751,7 @@ vgaHWFreeHWRec(ScrnInfoPtr scrp)
> }
> 
> 
>-Bool
>+_X_EXPORT Bool
> vgaHWMapMem(ScrnInfoPtr scrp)
> {
>     vgaHWPtr hwp = VGAHWPTR(scrp);
>@@ -1781,7 +1781,7 @@ vgaHWMapMem(ScrnInfoPtr scrp)
> }
> 
> 
>-void
>+_X_EXPORT void
> vgaHWUnmapMem(ScrnInfoPtr scrp)
> {
>     vgaHWPtr hwp = VGAHWPTR(scrp);
>@@ -1797,14 +1797,14 @@ vgaHWUnmapMem(ScrnInfoPtr scrp)
>     hwp->Base = NULL;
> }
> 
>-int
>+_X_EXPORT int
> vgaHWGetIndex()
> {
>     return vgaHWPrivateIndex;
> }
> 
> 
>-void
>+_X_EXPORT void
> vgaHWGetIOBase(vgaHWPtr hwp)
> {
>     hwp->IOBase = (hwp->readMiscOut(hwp) & 0x01) ?
>@@ -1815,14 +1815,14 @@ vgaHWGetIOBase(vgaHWPtr hwp)
> }
> 
> 
>-void
>+_X_EXPORT void
> vgaHWLock(vgaHWPtr hwp)
> {
>     /* Protect CRTC[0-7] */
>     hwp->writeCrtc(hwp, 0x11, hwp->readCrtc(hwp, 0x11) | 0x80);
> }
> 
>-void
>+_X_EXPORT void
> vgaHWUnlock(vgaHWPtr hwp)
> {
>     /* Unprotect CRTC[0-7] */
>@@ -1830,7 +1830,7 @@ vgaHWUnlock(vgaHWPtr hwp)
> }
> 
> 
>-void
>+_X_EXPORT void
> vgaHWEnable(vgaHWPtr hwp)
> {
>     hwp->writeEnable(hwp, hwp->readEnable(hwp) | 0x01);
>@@ -1897,7 +1897,7 @@ vgaHWSetOverscan(ScrnInfoPtr pScrn, int overscan)
> }
> 
> 
>-Bool
>+_X_EXPORT Bool
> vgaHWHandleColormaps(ScreenPtr pScreen)
> {
>     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
>@@ -1999,6 +1999,6 @@ vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
>     }
> }
> 
>-DDC1SetSpeedProc  vgaHWddc1SetSpeedWeak(void) { return vgaHWddc1SetSpeed; }
>+_X_EXPORT DDC1SetSpeedProc  vgaHWddc1SetSpeedWeak(void) { return vgaHWddc1SetSpeed; }
> 
>-SaveScreenProcPtr vgaHWSaveScreenWeak(void) { return vgaHWSaveScreen; }
>+_X_EXPORT SaveScreenProcPtr vgaHWSaveScreenWeak(void) { return vgaHWSaveScreen; }
>diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c
>index 9dbd00f..6b04579 100644
>--- a/hw/xfree86/xaa/xaaBitOrder.c
>+++ b/hw/xfree86/xaa/xaaBitOrder.c
>@@ -3,10 +3,11 @@
> #include <xorg-config.h>
> #endif
> 
>+#include "misc.h"
> #include <X11/Xmd.h>
> CARD32 XAAReverseBitOrder(CARD32 v);
> 
>-CARD32
>+_X_EXPORT CARD32
> XAAReverseBitOrder(CARD32 v)
> {
>  return (((0x01010101 & v) << 7) | ((0x02020202 & v) << 5) | 
>diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c
>index 7ab4031..fd2adbd 100644
>--- a/hw/xfree86/xaa/xaaFallback.c
>+++ b/hw/xfree86/xaa/xaaFallback.c
>@@ -346,7 +346,7 @@ GCOps XAAFallbackOps = {
>     {NULL}		/* devPrivate */
> };
> 
>-GCOps *XAAGetFallbackOps(void)
>+_X_EXPORT GCOps *XAAGetFallbackOps(void)
> {
>     return &XAAFallbackOps;
> }
>diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c
>index 55a30bb..cccd1fc 100644
>--- a/hw/xfree86/xaa/xaaFillRect.c
>+++ b/hw/xfree86/xaa/xaaFillRect.c
>@@ -372,7 +372,7 @@ XAARenderPixmapCopyRects(
> 	|   Solid    |
> 	\************/
> 
>-void
>+_X_EXPORT void
> XAAFillSolidRects(
>     ScrnInfoPtr pScrn,
>     int	fg, int rop,
>diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c
>index 910c7e1..28bec7a 100644
>--- a/hw/xfree86/xaa/xaaImage.c
>+++ b/hw/xfree86/xaa/xaaImage.c
>@@ -38,7 +38,7 @@ void XAAMoveDWORDS_FixedBase(
>      *dest = *(src + 2);
> }
> 
>-void XAAMoveDWORDS(
>+_X_EXPORT void XAAMoveDWORDS(
>    register CARD32* dest,
>    register CARD32* src,
>    register int dwords )
>diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
>index 892cbcf..6094751 100644
>--- a/hw/xfree86/xaa/xaaInit.c
>+++ b/hw/xfree86/xaa/xaaInit.c
>@@ -43,11 +43,11 @@ static DevPrivateKey XAAScreenKey = &XAAScreenKey;
> static DevPrivateKey XAAGCKey = &XAAGCKey;
> static DevPrivateKey XAAPixmapKey = &XAAPixmapKey;
> 
>-DevPrivateKey XAAGetScreenKey(void) {
>+_X_EXPORT DevPrivateKey XAAGetScreenKey(void) {
>     return XAAScreenKey;
> }
> 
>-DevPrivateKey XAAGetGCKey(void) {
>+_X_EXPORT DevPrivateKey XAAGetGCKey(void) {
>     return XAAGCKey;
> }
> 
>@@ -58,7 +58,7 @@ DevPrivateKey XAAGetPixmapKey(void) {
> /* temp kludge */
> static Bool SwitchedOut = FALSE;
> 
>-XAAInfoRecPtr
>+_X_EXPORT XAAInfoRecPtr
> XAACreateInfoRec()
> {
>     XAAInfoRecPtr infoRec;
>@@ -70,7 +70,7 @@ XAACreateInfoRec()
>     return infoRec;
> }
> 
>-void 
>+_X_EXPORT void
> XAADestroyInfoRec(XAAInfoRecPtr infoRec)
> {
>     if(!infoRec) return;
>@@ -88,7 +88,7 @@ XAADestroyInfoRec(XAAInfoRecPtr infoRec)
> }
> 
> 
>-Bool 
>+_X_EXPORT Bool
> XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
> {
>     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
>diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c
>index 7469de1..093d65f 100644
>--- a/hw/xfree86/xaa/xaaLine.c
>+++ b/hw/xfree86/xaa/xaaLine.c
>@@ -18,7 +18,7 @@
> #include "xaalocal.h"
> 
> 
>-void
>+_X_EXPORT void
> #ifdef POLYSEGMENT
> XAAPolySegment(
>     DrawablePtr	pDrawable,
>diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c
>index 64ca998..46c712d 100644
>--- a/hw/xfree86/xaa/xaaOverlayDF.c
>+++ b/hw/xfree86/xaa/xaaOverlayDF.c
>@@ -163,7 +163,7 @@ static DevPrivateKey XAAOverlayKey = &XAAOverlayKey;
>    }
> 
> 
>-Bool
>+_X_EXPORT Bool
> XAAInitDualFramebufferOverlay(
>     ScreenPtr pScreen, 
>     DepthChangeFuncPtr callback
>diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c
>index d05aaf2..069d818 100644
>--- a/hw/xfree86/xaa/xaaPCache.c
>+++ b/hw/xfree86/xaa/xaaPCache.c
>@@ -1657,7 +1657,7 @@ XAACachePlanarMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix)
>    return pCache;
> }
> 
>-XAACachePlanarMonoStippleProc
>+_X_EXPORT XAACachePlanarMonoStippleProc
> XAAGetCachePlanarMonoStipple(void) { return XAACachePlanarMonoStipple; }
> 
> XAACacheInfoPtr
>diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c
>index 74e90e3..2991695 100644
>--- a/hw/xfree86/xaa/xaaPict.c
>+++ b/hw/xfree86/xaa/xaaPict.c
>@@ -154,7 +154,7 @@ XAAGetRGBAFromPixel(
> 
> /* 8:8:8 + PICT_a8 -> 8:8:8:8 texture */
> 
>-void
>+_X_EXPORT void
> XAA_888_plus_PICT_a8_to_8888 (
>     CARD32 color,
>     CARD8  *alphaPtr,   /* in bytes */
>diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c
>index 155daa4..b315e02 100644
>--- a/hw/xfree86/xaa/xaaROP.c
>+++ b/hw/xfree86/xaa/xaaROP.c
>@@ -95,27 +95,27 @@ int XAAPatternROP_PM[16] =
>    ROP_DPo
> };
> 
>-int XAAGetCopyROP(int i)
>+_X_EXPORT int XAAGetCopyROP(int i)
> {
>     return XAACopyROP[i];
> }
> 
>-int XAAGetCopyROP_PM(int i)
>+_X_EXPORT int XAAGetCopyROP_PM(int i)
> {
>     return XAACopyROP_PM[i];
> }
> 
>-int XAAGetPatternROP(int i)
>+_X_EXPORT int XAAGetPatternROP(int i)
> {
>     return XAAPatternROP[i];
> }
> 
>-int XAAGetPatternROP_PM(int i)
>+_X_EXPORT int XAAGetPatternROP_PM(int i)
> {
>     return XAAPatternROP_PM[i];
> }
> 
>-int
>+_X_EXPORT int
> XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop)
> {
>     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
>@@ -150,7 +150,7 @@ XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop)
> }
> 
> 
>-int
>+_X_EXPORT int
> XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop)
> {
>     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
>diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c
>index 0dd8e9f..4735f78 100644
>--- a/hw/xfree86/xaa/xaaStipple.c
>+++ b/hw/xfree86/xaa/xaaStipple.c
>@@ -32,7 +32,7 @@ StippleScanlineProcPtr stipple_scanline_func[6] = {
>    StippleOver32_Inverted
> };
> 
>-StippleScanlineProcPtr *stipple_get_scanline_func(void) {
>+_X_EXPORT StippleScanlineProcPtr *stipple_get_scanline_func(void) {
>    return stipple_scanline_func;
> }
> 
>diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c
>index cb60266..d1d12c7 100644
>--- a/hw/xfree86/xaa/xaaTEGlyph.c
>+++ b/hw/xfree86/xaa/xaaTEGlyph.c
>@@ -126,7 +126,7 @@ GlyphScanlineFuncPtr glyph_scanline_func[32] = {
>    DrawTETextScanlineGeneric, DrawTETextScanlineGeneric
> };
> 
>-GlyphScanlineFuncPtr *glyph_get_scanline_func(void) {
>+_X_EXPORT GlyphScanlineFuncPtr *glyph_get_scanline_func(void) {
>    return glyph_scanline_func;
> }
> 
>diff --git a/hw/xfree86/xaa/xaaWrapper.c b/hw/xfree86/xaa/xaaWrapper.c
>index 5d6ea05..996ad15 100644
>--- a/hw/xfree86/xaa/xaaWrapper.c
>+++ b/hw/xfree86/xaa/xaaWrapper.c
>@@ -263,7 +263,7 @@ xaaWrapperListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapIds)
>     return n;
> }
> 
>-Bool
>+_X_EXPORT Bool
> xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *func)
> {
>     Bool ret;
>diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c
>index 83952d1..f8cf989 100644
>--- a/hw/xfree86/xf4bpp/ppcIO.c
>+++ b/hw/xfree86/xf4bpp/ppcIO.c
>@@ -169,7 +169,7 @@ v16CreateScreenResources
> }
> 
> 
>-Bool
>+_X_EXPORT Bool
> xf4bppScreenInit( pScreen, pbits, virtx, virty, dpix, dpiy, width )
>     ScreenPtr pScreen;
>     pointer pbits;
>diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c
>index c3432b8..26c34b1 100644
>--- a/hw/xfree86/xf8_32bpp/cfbscrinit.c
>+++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c
>@@ -279,7 +279,7 @@ cfb8_32SetupVisuals (ScreenPtr pScreen)
>     pScreenPriv->visualData = (pointer)overlayVisuals;
> }
> 
>-Bool
>+_X_EXPORT Bool
> cfb8_32ScreenInit(
>     ScreenPtr pScreen,
>     pointer pbits,		/* pointer to screen bitmap */
>diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c
>index c63b3cf..e36e2a9 100644
>--- a/hw/xfree86/xf8_32bpp/xf86overlay.c
>+++ b/hw/xfree86/xf8_32bpp/xf86overlay.c
>@@ -249,7 +249,7 @@ static DevPrivateKey OverlayPixmapKey = &OverlayPixmapKey;
>     pPixPriv->dirty |= IS_DIRTY
>     
> 
>-Bool
>+_X_EXPORT Bool
> xf86Overlay8Plus32Init (ScreenPtr pScreen)
> {
>     OverlayScreenPtr pScreenPriv;
>diff --git a/mfb/maskbits.c b/mfb/maskbits.c
>index 85b5f30..9b93562 100644
>--- a/mfb/maskbits.c
>+++ b/mfb/maskbits.c
>@@ -54,6 +54,7 @@ SOFTWARE.
> 
> #include "maskbits.h"
> #include "servermd.h"
>+#include <X11/Xfuncproto.h>
> 
> /*
> these tables are used by several macros in the mfb code.
>@@ -1001,11 +1002,11 @@ PixelType rmask[] =
> 
> #undef _1_
> 
>-PixelType mfbGetmask(int i) { return mask[i]; }
>-PixelType mfbGetrmask(int i) { return rmask[i]; }
>-PixelType mfbGetstarttab(int i) { return starttab[i]; }
>-PixelType mfbGetendtab(int i) { return endtab[i]; }
>-PixelType mfbGetpartmasks(int i, int j) { return partmasks[i][j]; }
>+_X_EXPORT PixelType mfbGetmask(int i) { return mask[i]; }
>+_X_EXPORT PixelType mfbGetrmask(int i) { return rmask[i]; }
>+_X_EXPORT PixelType mfbGetstarttab(int i) { return starttab[i]; }
>+_X_EXPORT PixelType mfbGetendtab(int i) { return endtab[i]; }
>+_X_EXPORT PixelType mfbGetpartmasks(int i, int j) { return partmasks[i][j]; }
> 
> /*
>  * Merge raster ops for full src + dest + plane mask
>@@ -1051,7 +1052,7 @@ mergeRopRec mergeRopBits[16] = {
> { O,O,O,I, },	/* set		0xf		1 */
> };
> 
>-mergeRopPtr mergeGetRopBits(int i) {
>+_X_EXPORT mergeRopPtr mergeGetRopBits(int i) {
>     return &mergeRopBits[i];
> }
> 
>diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c
>index 344c655..feb18cb 100644
>--- a/mfb/mfbbitblt.c
>+++ b/mfb/mfbbitblt.c
>@@ -399,7 +399,7 @@ int dstx, dsty;
> 
> static DevPrivateKey copyPlaneScreenKey = &copyPlaneScreenKey;
> 
>-Bool
>+_X_EXPORT Bool
> mfbRegisterCopyPlaneProc (pScreen, proc)
>     ScreenPtr	pScreen;
>     RegionPtr	(*proc)(
>diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c
>index 48e532a..19376b5 100644
>--- a/mfb/mfbclip.c
>+++ b/mfb/mfbclip.c
>@@ -92,7 +92,7 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&			\
>  * Then it coalesces the current line with the previous if they have boxes
>  * at the same X coordinates.
>  */
>-RegionPtr
>+_X_EXPORT RegionPtr
> mfbPixmapToRegion(pPix)
>     PixmapPtr	pPix;
> {
>@@ -273,7 +273,7 @@ mfbPixmapToRegion(pPix)
>     return(pReg);
> }
> 
>-mfbPixmapToRegionProc *
>+_X_EXPORT mfbPixmapToRegionProc *
> mfbPixmapToRegionWeak(void)
> {
>     return mfbPixmapToRegion;
>diff --git a/mfb/mfbfillsp.c b/mfb/mfbfillsp.c
>index c073535..09d7974 100644
>--- a/mfb/mfbfillsp.c
>+++ b/mfb/mfbfillsp.c
>@@ -570,7 +570,7 @@ mfbInvertStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
> 
> 
> 
>-void
>+_X_EXPORT void
> mfbTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
>     DrawablePtr pDrawable;
>     GC *pGC;
>diff --git a/mfb/mfbfont.c b/mfb/mfbfont.c
>index 672b5d9..2c41f2b 100644
>--- a/mfb/mfbfont.c
>+++ b/mfb/mfbfont.c
>@@ -57,7 +57,7 @@ SOFTWARE.
> #include "scrnintstr.h"
> 
> /*ARGSUSED*/
>-Bool
>+_X_EXPORT Bool
> mfbRealizeFont( pscr, pFont)
>     ScreenPtr	pscr;
>     FontPtr	pFont;
>@@ -65,14 +65,14 @@ mfbRealizeFont( pscr, pFont)
>     return (TRUE);
> }
> 
>-mfbRealizeFontProc *
>+_X_EXPORT mfbRealizeFontProc *
> mfbRealizeFontWeak(void)
> {
>     return mfbRealizeFont;
> }
> 
> /*ARGSUSED*/
>-Bool
>+_X_EXPORT Bool
> mfbUnrealizeFont( pscr, pFont)
>     ScreenPtr	pscr;
>     FontPtr	pFont;
>@@ -80,7 +80,7 @@ mfbUnrealizeFont( pscr, pFont)
>     return (TRUE);
> }
> 
>-mfbUnrealizeFontProc *
>+_X_EXPORT mfbUnrealizeFontProc *
> mfbUnrealizeFontWeak(void)
> {
>     return mfbUnrealizeFont;
>diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c
>index 7492d7c..5a8abdb 100644
>--- a/mfb/mfbgc.c
>+++ b/mfb/mfbgc.c
>@@ -400,7 +400,7 @@ matchCommon (
> }
> 
> 
>-Bool
>+_X_EXPORT Bool
> mfbCreateGC(pGC)
>     register GCPtr pGC;
> {
>@@ -996,13 +996,13 @@ int InverseAlu[16] = {
> 	GXset
> };
> 
>-int mfbGetInverseAlu(i)
>+_X_EXPORT int mfbGetInverseAlu(i)
>     int i;
> {
>     return InverseAlu[i];
> }
> 
>-int
>+_X_EXPORT int
> mfbReduceRop(alu, src)
>     register int alu;
>     register Pixel src;
>diff --git a/mfb/mfbgetsp.c b/mfb/mfbgetsp.c
>index befe57a..07c1134 100644
>--- a/mfb/mfbgetsp.c
>+++ b/mfb/mfbgetsp.c
>@@ -70,7 +70,7 @@ SOFTWARE.
>  * out to an integral number of words.
>  */
> /*ARGSUSED*/
>-void
>+_X_EXPORT void
> mfbGetSpans(pDrawable, wMax, ppt, pwidth, nspans, pchardstStart)
>     DrawablePtr		pDrawable;	/* drawable from which to get bits */
>     int			wMax;		/* largest value of all *pwidths */
>diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c
>index 8861865..7da34e2 100644
>--- a/mfb/mfbimage.c
>+++ b/mfb/mfbimage.c
>@@ -136,7 +136,7 @@ mfbPutImage(dst, pGC, depth, x, y, w, h, leftPad, format, pImage)
>  *	For any planemask with bit 0 == 0, just fill the dst with 0.
>  */
> /*ARGSUSED*/
>-void
>+_X_EXPORT void
> mfbGetImage( pDrawable, sx, sy, w, h, format, planeMask, pdstLine)
>     DrawablePtr pDrawable;
>     int		sx, sy, w, h;
>diff --git a/mfb/mfbmisc.c b/mfb/mfbmisc.c
>index 5154e27..5f2025c 100644
>--- a/mfb/mfbmisc.c
>+++ b/mfb/mfbmisc.c
>@@ -56,7 +56,7 @@ SOFTWARE.
> #include "mfb.h"
> 
> /*ARGSUSED*/
>-void
>+_X_EXPORT void
> mfbQueryBestSize(class, pwidth, pheight, pScreen)
> int class;
> unsigned short *pwidth;
>@@ -92,7 +92,7 @@ ScreenPtr pScreen;
>     }
> }
> 
>-mfbQueryBestSizeProc *
>+_X_EXPORT mfbQueryBestSizeProc *
> mfbQueryBestSizeWeak(void)
> {
>     return mfbQueryBestSize;
>diff --git a/mfb/mfbpixmap.c b/mfb/mfbpixmap.c
>index 34bb33d..2ceed6f 100644
>--- a/mfb/mfbpixmap.c
>+++ b/mfb/mfbpixmap.c
>@@ -109,7 +109,7 @@ mfbCreatePixmap (pScreen, width, height, depth, usage_hint)
> }
> 
> 
>-Bool
>+_X_EXPORT Bool
> mfbDestroyPixmap(pPixmap)
>     PixmapPtr pPixmap;
> {
>@@ -191,7 +191,7 @@ mfbPadPixmap(pPixmap)
>  * words are PPW bits wide, and that the least significant bit appears on the
>  * left.
>  */
>-void
>+_X_EXPORT void
> mfbXRotatePixmap(pPix, rw)
>     PixmapPtr	pPix;
>     register int rw;
>@@ -231,7 +231,7 @@ mfbXRotatePixmap(pPix, rw)
>    pPix->height
>    works on any width.
>  */
>-void
>+_X_EXPORT void
> mfbYRotatePixmap(pPix, rh)
>     register PixmapPtr	pPix;
>     int	rh;
>diff --git a/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c
>index de96992..2d68fd7 100644
>--- a/mfb/mfbpushpxl.c
>+++ b/mfb/mfbpushpxl.c
>@@ -158,7 +158,7 @@ mfbSolidPP(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg)
>  * the GC's logical function. The drawable is not changed where the bitmap
>  * has a zero bit or outside the area covered by the stencil.
>  */
>-void
>+_X_EXPORT void
> mfbPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg)
>     GCPtr	pGC;
>     PixmapPtr	pBitMap;
>@@ -281,7 +281,7 @@ mfbPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg)
>     }
> }
> 
>-mfbPushPixelsProc *mfbPushPixelsWeak(void)
>+_X_EXPORT mfbPushPixelsProc *mfbPushPixelsWeak(void)
> {
>    return mfbPushPixels;
> }
>diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c
>index 8873a1b..b579d2e 100644
>--- a/mfb/mfbscrinit.c
>+++ b/mfb/mfbscrinit.c
>@@ -72,7 +72,7 @@ static DevPrivateKey frameWindowPrivateKey = &frameWindowPrivateKey;
> DevPrivateKey frameGetWindowPrivateKey(void) { return frameWindowPrivateKey; }
> #endif
> static DevPrivateKey mfbGCPrivateKey = &mfbGCPrivateKey;
>-DevPrivateKey mfbGetGCPrivateKey(void) { return mfbGCPrivateKey; }
>+_X_EXPORT DevPrivateKey mfbGetGCPrivateKey(void) { return mfbGCPrivateKey; }
> static unsigned long mfbGeneration = 0;
> 
> static VisualRec visual = {
>@@ -87,7 +87,7 @@ static DepthRec depth = {
>     1,		1,		&VID
> };
> 
>-Bool
>+_X_EXPORT Bool
> mfbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey)
> {
>     if (mfbGeneration != serverGeneration)
>@@ -105,7 +105,7 @@ mfbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey)
> 
> 
> /* dts * (inch/dot) * (25.4 mm / inch) = mm */
>-Bool
>+_X_EXPORT Bool
> mfbScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width)
>     register ScreenPtr pScreen;
>     pointer pbits;		/* pointer to screen bitmap */
>@@ -171,7 +171,7 @@ mfbSetWindowPixmap(pWin, pPix)
> #endif
> }
> 
>-void mfbFillInScreen(ScreenPtr pScreen)
>+_X_EXPORT void mfbFillInScreen(ScreenPtr pScreen)
> {
>     pScreen->ChangeWindowAttributes = mfbChangeWindowAttributes;
>     pScreen->RealizeWindow = mfbMapWindow;
>diff --git a/mfb/mfbsetsp.c b/mfb/mfbsetsp.c
>index 24add83..394c404 100644
>--- a/mfb/mfbsetsp.c
>+++ b/mfb/mfbsetsp.c
>@@ -151,7 +151,7 @@ mfbSetScanline(y, xOrigin, xStart, xEnd, psrc, alu, pdstBase, widthDst)
>  * Source bit lines are server scanline padded so that they always begin
>  * on a word boundary.
>  */ 
>-void
>+_X_EXPORT void
> mfbSetSpans(pDrawable, pGC, pcharsrc, ppt, pwidth, nspans, fSorted)
>     DrawablePtr		pDrawable;
>     GCPtr		pGC;
>diff --git a/mi/miregion.c b/mi/miregion.c
>index 45768a3..77ba87a 100644
>--- a/mi/miregion.c
>+++ b/mi/miregion.c
>@@ -285,7 +285,7 @@ miRegionEqual(reg1, reg2)
> }
> 
> #ifdef DEBUG
>-Bool
>+_X_EXPORT Bool
> miValidRegion(reg)
>     RegionPtr reg;
> {
>diff --git a/miext/damage/damage.c b/miext/damage/damage.c
>index 56864c5..a9ffa9b 100755
>--- a/miext/damage/damage.c
>+++ b/miext/damage/damage.c
>@@ -1736,7 +1736,7 @@ damageCloseScreen (int i, ScreenPtr pScreen)
>     return (*pScreen->CloseScreen) (i, pScreen);
> }
> 
>-Bool
>+_X_EXPORT Bool
> DamageSetup (ScreenPtr pScreen)
> {
>     DamageScrPrivPtr	pScrPriv;
>@@ -1774,7 +1774,7 @@ DamageSetup (ScreenPtr pScreen)
>     return TRUE;
> }
> 
>-DamagePtr
>+_X_EXPORT DamagePtr
> DamageCreate (DamageReportFunc  damageReport,
> 	      DamageDestroyFunc	damageDestroy,
> 	      DamageReportLevel	damageLevel,
>@@ -1804,7 +1804,7 @@ DamageCreate (DamageReportFunc  damageReport,
>     return pDamage;
> }
> 
>-void
>+_X_EXPORT void
> DamageRegister (DrawablePtr pDrawable,
> 		DamagePtr   pDamage)
> {
>@@ -1840,7 +1840,7 @@ DamageDrawInternal (ScreenPtr pScreen, Bool enable)
>     pScrPriv->internalLevel += enable ? 1 : -1;
> }
> 
>-void
>+_X_EXPORT void
> DamageUnregister (DrawablePtr	    pDrawable,
> 		  DamagePtr	    pDamage)
> {
>@@ -1875,7 +1875,7 @@ DamageUnregister (DrawablePtr	    pDrawable,
>     damageRemoveDamage (getDrawableDamageRef (pDrawable), pDamage);
> }
> 
>-void
>+_X_EXPORT void
> DamageDestroy (DamagePtr    pDamage)
> {
>     if (pDamage->damageDestroy)
>@@ -1918,13 +1918,13 @@ DamageSubtract (DamagePtr	    pDamage,
>     return REGION_NOTEMPTY (pDrawable->pScreen, &pDamage->damage);
> }
> 
>-void
>+_X_EXPORT void
> DamageEmpty (DamagePtr	    pDamage)
> {
>     REGION_EMPTY (pDamage->pDrawable->pScreen, &pDamage->damage);
> }
> 
>-RegionPtr
>+_X_EXPORT RegionPtr
> DamageRegion (DamagePtr		    pDamage)
> {
>     return &pDamage->damage;
>@@ -1949,7 +1949,7 @@ DamageDamageRegion (DrawablePtr	pDrawable,
>     damageReportPostOp (pDrawable);
> }
> 
>-void
>+_X_EXPORT void
> DamageSetReportAfterOp (DamagePtr pDamage, Bool reportAfter)
> {
>     pDamage->reportAfter = reportAfter;
>diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c
>index ef0df40..d0a9190 100644
>--- a/miext/shadow/shadow.c
>+++ b/miext/shadow/shadow.c
>@@ -130,7 +130,7 @@ shadowReportFunc(DamagePtr pDamage, RegionPtr pRegion, void *closure)
> }
> #endif
> 
>-Bool
>+_X_EXPORT Bool
> shadowSetup(ScreenPtr pScreen)
> {
>     shadowBufPtr pBuf;
>@@ -172,7 +172,7 @@ shadowSetup(ScreenPtr pScreen)
>     return TRUE;
> }
> 
>-Bool
>+_X_EXPORT Bool
> shadowAdd(ScreenPtr pScreen, PixmapPtr pPixmap, ShadowUpdateProc update,
> 	  ShadowWindowProc window, int randr, void *closure)
> {
>@@ -209,7 +209,7 @@ shadowAdd(ScreenPtr pScreen, PixmapPtr pPixmap, ShadowUpdateProc update,
>     return TRUE;
> }
> 
>-void
>+_X_EXPORT void
> shadowRemove(ScreenPtr pScreen, PixmapPtr pPixmap)
> {
>     shadowBuf(pScreen);
>@@ -227,7 +227,7 @@ shadowRemove(ScreenPtr pScreen, PixmapPtr pPixmap)
> 				 (pointer) pScreen);
> }
> 
>-Bool
>+_X_EXPORT Bool
> shadowInit(ScreenPtr pScreen, ShadowUpdateProc update, ShadowWindowProc window)
> {
>     PixmapPtr pPixmap;
>diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c
>index 678f8c6..1688ce1 100644
>--- a/miext/shadow/shpacked.c
>+++ b/miext/shadow/shpacked.c
>@@ -112,4 +112,4 @@ shadowUpdatePacked (ScreenPtr	    pScreen,
>     }
> }
> 
>-shadowUpdateProc shadowUpdatePackedWeak(void) { return shadowUpdatePacked; }
>+_X_EXPORT shadowUpdateProc shadowUpdatePackedWeak(void) { return shadowUpdatePacked; }
>diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c
>index b5983dc..996e1cb 100644
>--- a/miext/shadow/shplanar.c
>+++ b/miext/shadow/shplanar.c
>@@ -171,10 +171,10 @@ shadowUpdatePlanar4 (ScreenPtr	    pScreen,
>     }
> }
> 
>-shadowUpdateProc shadowUpdatePlanar4Weak(void) {
>+_X_EXPORT shadowUpdateProc shadowUpdatePlanar4Weak(void) {
>     return shadowUpdatePlanar4;
> }
> 
>-shadowUpdateProc shadowUpdatePlanar4x8Weak(void) {
>+_X_EXPORT shadowUpdateProc shadowUpdatePlanar4x8Weak(void) {
>     return shadowUpdatePlanar4x8;
> }
>diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c
>index 673cd76..096995d 100644
>--- a/miext/shadow/shrotate.c
>+++ b/miext/shadow/shrotate.c
>@@ -308,6 +308,6 @@ shadowUpdateRotatePacked (ScreenPtr	pScreen,
>     }
> }
> 
>-shadowUpdateProc shadowUpdateRotatePackedWeak(void) {
>+_X_EXPORT shadowUpdateProc shadowUpdateRotatePackedWeak(void) {
>     return shadowUpdateRotatePacked;
> }
>diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h
>index 015a985..f49b174 100644
>--- a/miext/shadow/shrotpack.h
>+++ b/miext/shadow/shrotpack.h
>@@ -93,7 +93,7 @@
> 
> #endif
> 
>-void
>+_X_EXPORT void
> FUNC (ScreenPtr	    pScreen,
>       shadowBufPtr  pBuf)
> {
>diff --git a/os/WaitFor.c b/os/WaitFor.c
>index 36e01ca..2b59d52 100644
>--- a/os/WaitFor.c
>+++ b/os/WaitFor.c
>@@ -646,7 +646,7 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,pointer arg)
> 
> static OsTimerPtr ScreenSaverTimer = NULL;
> 
>-void
>+_X_EXPORT void
> FreeScreenSaverTimer(void)
> {
>     if (ScreenSaverTimer) {
>@@ -655,7 +655,7 @@ FreeScreenSaverTimer(void)
>     }
> }
> 
>-void
>+_X_EXPORT void
> SetScreenSaverTimer(void)
> {
>     CARD32 timeout = 0;
>diff --git a/os/utils.c b/os/utils.c
>index 53bb0b3..c42df94 100644
>--- a/os/utils.c
>+++ b/os/utils.c
>@@ -1467,7 +1467,7 @@ OsInitAllocator (void)
> #endif /* !INTERNAL_MALLOC */
> 
> 
>-char *
>+_X_EXPORT char *
> Xstrdup(const char *s)
> {
>     char *sd;
>diff --git a/os/xprintf.c b/os/xprintf.c
>index 07eaa1f..c88d692 100644
>--- a/os/xprintf.c
>+++ b/os/xprintf.c
>@@ -93,7 +93,7 @@ XNFvprintf(const char *format, va_list va)
>     return ret;
> }
> 
>-char *XNFprintf(const char *format, ...)
>+_X_EXPORT char *XNFprintf(const char *format, ...)
> {
>     char *ret;
>     va_list va;
>diff --git a/randr/randr.c b/randr/randr.c
>index bc2b995..dcc53e2 100644
>--- a/randr/randr.c
>+++ b/randr/randr.c
>@@ -214,7 +214,7 @@ Bool RRInit (void)
>     return TRUE;
> }
> 
>-Bool RRScreenInit(ScreenPtr pScreen)
>+_X_EXPORT Bool RRScreenInit(ScreenPtr pScreen)
> {
>     rrScrPrivPtr   pScrPriv;
> 
>diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
>index 7c22437..ceb91a1 100644
>--- a/randr/rrcrtc.c
>+++ b/randr/rrcrtc.c
>@@ -401,7 +401,7 @@ RRCrtcDestroyResource (pointer value, XID pid)
>  * Request that the Crtc gamma be changed
>  */
> 
>-Bool
>+_X_EXPORT Bool
> RRCrtcGammaSet (RRCrtcPtr   crtc,
> 		CARD16	    *red,
> 		CARD16	    *green,
>diff --git a/randr/rrinfo.c b/randr/rrinfo.c
>index 7e77d39..eec2305 100644
>--- a/randr/rrinfo.c
>+++ b/randr/rrinfo.c
>@@ -248,7 +248,7 @@ RRScreenSizeMatches (RRScreenSizePtr  a,
>     return TRUE;
> }
> 
>-RRScreenSizePtr
>+_X_EXPORT RRScreenSizePtr
> RRRegisterSize (ScreenPtr	    pScreen,
> 		short		    width, 
> 		short		    height,
>@@ -282,6 +282,7 @@ RRRegisterSize (ScreenPtr	    pScreen,
>     return &pNew[pScrPriv->nSizes-1];
> }
> 
>+_X_EXPORT
> Bool RRRegisterRate (ScreenPtr		pScreen,
> 		     RRScreenSizePtr	pSize,
> 		     int		rate)
>@@ -307,7 +308,7 @@ Bool RRRegisterRate (ScreenPtr		pScreen,
>     return TRUE;
> }
> 
>-Rotation
>+_X_EXPORT Rotation
> RRGetRotation(ScreenPtr pScreen)
> {
>     RROutputPtr	output = RRFirstOutput (pScreen);
>@@ -318,7 +319,7 @@ RRGetRotation(ScreenPtr pScreen)
>     return output->crtc->rotation;
> }
> 
>-void
>+_X_EXPORT void
> RRSetCurrentConfig (ScreenPtr		pScreen,
> 		    Rotation		rotation,
> 		    int			rate,
>diff --git a/randr/rrproperty.c b/randr/rrproperty.c
>index 9bb7081..349414b 100644
>--- a/randr/rrproperty.c
>+++ b/randr/rrproperty.c
>@@ -118,7 +118,7 @@ RRDeleteOutputProperty (RROutputPtr output, Atom property)
>     }
> }
> 
>-int
>+_X_EXPORT int
> RRChangeOutputProperty (RROutputPtr output, Atom property, Atom type,
> 			int format, int mode, unsigned long len,
> 			pointer value, Bool sendevent, Bool pending)
>@@ -317,7 +317,7 @@ RRGetOutputProperty (RROutputPtr output, Atom property, Bool pending)
>     }
> }
> 
>-int
>+_X_EXPORT int
> RRConfigureOutputProperty (RROutputPtr output, Atom property,
> 			   Bool pending, Bool range, Bool immutable,
> 			   int num_values, INT32 *values)
>diff --git a/render/filter.c b/render/filter.c
>index 092313f..f02186f 100644
>--- a/render/filter.c
>+++ b/render/filter.c
>@@ -102,7 +102,7 @@ PictureSetDefaultIds (void)
>     return TRUE;
> }
> 
>-char *
>+_X_EXPORT char *
> PictureGetFilterName (int id)
> {
>     if (0 <= id && id < nfilterNames)
>@@ -266,7 +266,7 @@ PictureResetFilters (ScreenPtr pScreen)
>     PictureFreeFilterIds ();
> }
> 
>-int
>+_X_EXPORT int
> SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int nparams)
> {
>     PictFilterPtr	pFilter;
>diff --git a/render/mipict.c b/render/mipict.c
>index 87dccbb..e8953b3 100644
>--- a/render/mipict.c
>+++ b/render/mipict.c
>@@ -341,7 +341,7 @@ miClipPictureSrc (RegionPtr	pRegion,
>     }
> }
> 
>-void
>+_X_EXPORT void
> miCompositeSourceValidate (PicturePtr	pPicture,
> 			   INT16	x,
> 			   INT16	y,
>@@ -545,7 +545,7 @@ miFillColor (CARD32 pixel, int bits)
>     return (CARD16) pixel;
> }
> 
>-Bool
>+_X_EXPORT Bool
> miIsSolidAlpha (PicturePtr pSrc)
> {
>     ScreenPtr	pScreen;
>diff --git a/render/mitrap.c b/render/mitrap.c
>index 8bdc8a8..9ff3952 100644
>--- a/render/mitrap.c
>+++ b/render/mitrap.c
>@@ -94,7 +94,7 @@ miLineFixedX (xLineFixed *l, xFixed y, Bool ceil)
>     return l->p1.x + (xFixed) (ex / dy);
> }
> 
>-void
>+_X_EXPORT void
> miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box)
> {
>     box->y1 = MAXSHORT;
>diff --git a/render/mitri.c b/render/mitri.c
>index a92c19b..b48f9f9 100644
>--- a/render/mitri.c
>+++ b/render/mitri.c
>@@ -61,7 +61,7 @@ miPointFixedBounds (int npoint, xPointFixed *points, BoxPtr bounds)
>     }
> }
> 
>-void
>+_X_EXPORT void
> miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds)
> {
>     miPointFixedBounds (ntri * 3, (xPointFixed *) tris, bounds);
>diff --git a/render/picture.c b/render/picture.c
>index 35e2a28..9be7516 100644
>--- a/render/picture.c
>+++ b/render/picture.c
>@@ -529,7 +529,7 @@ PictureMatchVisual (ScreenPtr pScreen, int depth, VisualPtr pVisual)
>     return 0;
> }
> 
>-PictFormatPtr
>+_X_EXPORT PictFormatPtr
> PictureMatchFormat (ScreenPtr pScreen, int depth, CARD32 f)
> {
>     PictureScreenPtr    ps = GetPictureScreenIfSet(pScreen);
>@@ -700,7 +700,7 @@ SetPictureToDefaults (PicturePtr    pPicture)
>     pPicture->pSourcePict = 0;
> }
> 
>-PicturePtr
>+_X_EXPORT PicturePtr
> CreatePicture (Picture		pid,
> 	       DrawablePtr	pDrawable,
> 	       PictFormatPtr	pFormat,
>@@ -1275,7 +1275,7 @@ SetPictureClipRects (PicturePtr	pPicture,
>     return result;
> }
> 
>-int
>+_X_EXPORT int
> SetPictureClipRegion (PicturePtr    pPicture,
>                       int           xOrigin,
>                       int           yOrigin,
>@@ -1333,7 +1333,7 @@ transformIsIdentity(PictTransform *t)
>             (t->matrix[2][1] == 0));
> }
> 
>-int
>+_X_EXPORT int
> SetPictureTransform (PicturePtr	    pPicture,
> 		     PictTransform  *transform)
> {
>@@ -1372,7 +1372,7 @@ SetPictureTransform (PicturePtr	    pPicture,
>     return Success;
> }
> 
>-void
>+_X_EXPORT void
> CopyPicture (PicturePtr	pSrc,
> 	     Mask	mask,
> 	     PicturePtr	pDst)
>@@ -1469,7 +1469,7 @@ ValidateOnePicture (PicturePtr pPicture)
>     }
> }
> 
>-void
>+_X_EXPORT void
> ValidatePicture(PicturePtr pPicture)
> {
>     ValidateOnePicture (pPicture);
>@@ -1477,7 +1477,7 @@ ValidatePicture(PicturePtr pPicture)
> 	ValidateOnePicture (pPicture->alphaMap);
> }
> 
>-int
>+_X_EXPORT int
> FreePicture (pointer	value,
> 	     XID	pid)
> {
>@@ -1633,7 +1633,7 @@ ReduceCompositeOp (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst)
>     return op;
> }
> 
>-void
>+_X_EXPORT void
> CompositePicture (CARD8		op,
> 		  PicturePtr	pSrc,
> 		  PicturePtr	pMask,
>-- 
>1.5.3.2
>

Actions: View | Splinter Review

Attachments on bug 14730: 14683 | 14684 | 14685 | 14686 | 14687 | 14688 | 15112 | 15864 | 16466

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.