diff options
Diffstat (limited to 'mi')
51 files changed, 274 insertions, 274 deletions
diff --git a/mi/Makefile.am b/mi/Makefile.am index 7d76929ef..e6a4e600b 100644 --- a/mi/Makefile.am +++ b/mi/Makefile.am @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libmi.la if XORG sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \ migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \ - mispans.h miwideline.h mistruct.h mifpoly.h + mispans.h miwideline.h mistruct.h mifpoly.h mioverlay.h endif AM_CFLAGS = $(DIX_CFLAGS) @@ -65,7 +65,7 @@ typedef struct _miDash *miDashPtr; /* miarc.c */ -extern void miPolyArc( +extern _X_EXPORT void miPolyArc( DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*narcs*/, @@ -74,7 +74,7 @@ extern void miPolyArc( /* mibitblt.c */ -extern RegionPtr miCopyArea( +extern _X_EXPORT RegionPtr miCopyArea( DrawablePtr /*pSrcDrawable*/, DrawablePtr /*pDstDrawable*/, GCPtr /*pGC*/, @@ -86,7 +86,7 @@ extern RegionPtr miCopyArea( int /*yOut*/ ); -extern RegionPtr miCopyPlane( +extern _X_EXPORT RegionPtr miCopyPlane( DrawablePtr /*pSrcDrawable*/, DrawablePtr /*pDstDrawable*/, GCPtr /*pGC*/, @@ -99,7 +99,7 @@ extern RegionPtr miCopyPlane( unsigned long /*bitPlane*/ ); -extern void miGetImage( +extern _X_EXPORT void miGetImage( DrawablePtr /*pDraw*/, int /*sx*/, int /*sy*/, @@ -110,7 +110,7 @@ extern void miGetImage( char * /*pdstLine*/ ); -extern void miPutImage( +extern _X_EXPORT void miPutImage( DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*depth*/, @@ -125,7 +125,7 @@ extern void miPutImage( /* micursor.c */ -extern void miRecolorCursor( +extern _X_EXPORT void miRecolorCursor( DeviceIntPtr /* pDev */, ScreenPtr /*pScr*/, CursorPtr /*pCurs*/, @@ -134,7 +134,7 @@ extern void miRecolorCursor( /* midash.c */ -extern void miStepDash( +extern _X_EXPORT void miStepDash( int /*dist*/, int * /*pDashIndex*/, unsigned char * /*pDash*/, @@ -149,35 +149,35 @@ extern void miStepDash( typedef struct _DeviceRec *DevicePtr; #endif -extern Bool mieqInit( +extern _X_EXPORT Bool mieqInit( void ); -extern void mieqResizeEvents( +extern _X_EXPORT void mieqResizeEvents( int /* min_size */ ); -extern void mieqEnqueue( +extern _X_EXPORT void mieqEnqueue( DeviceIntPtr /*pDev*/, xEventPtr /*e*/ ); -extern void mieqSwitchScreen( +extern _X_EXPORT void mieqSwitchScreen( DeviceIntPtr /* pDev */, ScreenPtr /*pScreen*/, Bool /*fromDIX*/ ); -extern void mieqProcessInputEvents( +extern _X_EXPORT void mieqProcessInputEvents( void ); typedef void (*mieqHandler)(int, xEventPtr, DeviceIntPtr, int); -void mieqSetHandler(int event, mieqHandler handler); +void _X_EXPORT mieqSetHandler(int event, mieqHandler handler); /* miexpose.c */ -extern RegionPtr miHandleExposures( +extern _X_EXPORT RegionPtr miHandleExposures( DrawablePtr /*pSrcDrawable*/, DrawablePtr /*pDstDrawable*/, GCPtr /*pGC*/, @@ -190,7 +190,7 @@ extern RegionPtr miHandleExposures( unsigned long /*plane*/ ); -extern void miSendGraphicsExpose( +extern _X_EXPORT void miSendGraphicsExpose( ClientPtr /*client*/, RegionPtr /*pRgn*/, XID /*drawable*/, @@ -198,33 +198,33 @@ extern void miSendGraphicsExpose( int /*minor*/ ); -extern void miSendExposures( +extern _X_EXPORT void miSendExposures( WindowPtr /*pWin*/, RegionPtr /*pRgn*/, int /*dx*/, int /*dy*/ ); -extern void miWindowExposures( +extern _X_EXPORT void miWindowExposures( WindowPtr /*pWin*/, RegionPtr /*prgn*/, RegionPtr /*other_exposed*/ ); -extern void miPaintWindow( +extern _X_EXPORT void miPaintWindow( WindowPtr /*pWin*/, RegionPtr /*prgn*/, int /*what*/ ); -extern void miClearDrawable( +extern _X_EXPORT void miClearDrawable( DrawablePtr /*pDraw*/, GCPtr /*pGC*/ ); /* mifillrct.c */ -extern void miPolyFillRect( +extern _X_EXPORT void miPolyFillRect( DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*nrectFill*/, @@ -233,7 +233,7 @@ extern void miPolyFillRect( /* miglblt.c */ -extern void miPolyGlyphBlt( +extern _X_EXPORT void miPolyGlyphBlt( DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*x*/, @@ -243,7 +243,7 @@ extern void miPolyGlyphBlt( pointer /*pglyphBase*/ ); -extern void miImageGlyphBlt( +extern _X_EXPORT void miImageGlyphBlt( DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*x*/, @@ -255,7 +255,7 @@ extern void miImageGlyphBlt( /* mipoly.c */ -extern void miFillPolygon( +extern _X_EXPORT void miFillPolygon( DrawablePtr /*dst*/, GCPtr /*pgc*/, int /*shape*/, @@ -266,7 +266,7 @@ extern void miFillPolygon( /* mipolycon.c */ -extern Bool miFillConvexPoly( +extern _X_EXPORT Bool miFillConvexPoly( DrawablePtr /*dst*/, GCPtr /*pgc*/, int /*count*/, @@ -275,7 +275,7 @@ extern Bool miFillConvexPoly( /* mipolygen.c */ -extern Bool miFillGeneralPoly( +extern _X_EXPORT Bool miFillGeneralPoly( DrawablePtr /*dst*/, GCPtr /*pgc*/, int /*count*/, @@ -284,7 +284,7 @@ extern Bool miFillGeneralPoly( /* mipolypnt.c */ -extern void miPolyPoint( +extern _X_EXPORT void miPolyPoint( DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*mode*/, @@ -294,7 +294,7 @@ extern void miPolyPoint( /* mipolyrect.c */ -extern void miPolyRectangle( +extern _X_EXPORT void miPolyRectangle( DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*nrects*/, @@ -303,7 +303,7 @@ extern void miPolyRectangle( /* mipolyseg.c */ -extern void miPolySegment( +extern _X_EXPORT void miPolySegment( DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*nseg*/, @@ -312,7 +312,7 @@ extern void miPolySegment( /* mipolytext.c */ -extern int miPolyText8( +extern _X_EXPORT int miPolyText8( DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*x*/, @@ -321,7 +321,7 @@ extern int miPolyText8( char * /*chars*/ ); -extern int miPolyText16( +extern _X_EXPORT int miPolyText16( DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*x*/, @@ -330,7 +330,7 @@ extern int miPolyText16( unsigned short * /*chars*/ ); -extern void miImageText8( +extern _X_EXPORT void miImageText8( DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*x*/, @@ -339,7 +339,7 @@ extern void miImageText8( char * /*chars*/ ); -extern void miImageText16( +extern _X_EXPORT void miImageText16( DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*x*/, @@ -350,7 +350,7 @@ extern void miImageText16( /* mipushpxl.c */ -extern void miPushPixels( +extern _X_EXPORT void miPushPixels( GCPtr /*pGC*/, PixmapPtr /*pBitMap*/, DrawablePtr /*pDrawable*/, @@ -364,22 +364,22 @@ extern void miPushPixels( /* see also region.h */ -extern Bool miRectAlloc( +extern _X_EXPORT Bool miRectAlloc( RegionPtr /*pRgn*/, int /*n*/ ); #ifdef DEBUG -extern Bool miValidRegion( +extern _X_EXPORT Bool miValidRegion( RegionPtr /*prgn*/ ); #endif -extern Bool miRegionBroken(RegionPtr pReg); +extern _X_EXPORT Bool miRegionBroken(RegionPtr pReg); /* miscrinit.c */ -extern Bool miModifyPixmapHeader( +extern _X_EXPORT Bool miModifyPixmapHeader( PixmapPtr /*pPixmap*/, int /*width*/, int /*height*/, @@ -389,17 +389,17 @@ extern Bool miModifyPixmapHeader( pointer /*pPixData*/ ); -extern Bool miCreateScreenResources( +extern _X_EXPORT Bool miCreateScreenResources( ScreenPtr /*pScreen*/ ); -extern Bool miScreenDevPrivateInit( +extern _X_EXPORT Bool miScreenDevPrivateInit( ScreenPtr /*pScreen*/, int /*width*/, pointer /*pbits*/ ); -extern Bool miScreenInit( +extern _X_EXPORT Bool miScreenInit( ScreenPtr /*pScreen*/, pointer /*pbits*/, int /*xsize*/, @@ -415,13 +415,13 @@ extern Bool miScreenInit( VisualPtr /*visuals*/ ); -extern DevPrivateKey miAllocateGCPrivateIndex( +extern _X_EXPORT DevPrivateKey miAllocateGCPrivateIndex( void ); /* mivaltree.c */ -extern int miShapedWindowIn( +extern _X_EXPORT int miShapedWindowIn( ScreenPtr /*pScreen*/, RegionPtr /*universe*/, RegionPtr /*bounding*/, @@ -436,17 +436,17 @@ typedef void typedef RegionPtr (*GetRedirectBorderClipProcPtr) (WindowPtr pWindow); -void +extern _X_EXPORT void miRegisterRedirectBorderClipProc (SetRedirectBorderClipProcPtr setBorderClip, GetRedirectBorderClipProcPtr getBorderClip); -extern int miValidateTree( +extern _X_EXPORT int miValidateTree( WindowPtr /*pParent*/, WindowPtr /*pChild*/, VTKind /*kind*/ ); -extern void miWideLine( +extern _X_EXPORT void miWideLine( DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*mode*/, @@ -454,7 +454,7 @@ extern void miWideLine( DDXPointPtr /*pPts*/ ); -extern void miWideDash( +extern _X_EXPORT void miWideDash( DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*mode*/, @@ -464,7 +464,7 @@ extern void miWideDash( /* miwindow.c */ -extern void miClearToBackground( +extern _X_EXPORT void miClearToBackground( WindowPtr /*pWin*/, int /*x*/, int /*y*/, @@ -473,21 +473,21 @@ extern void miClearToBackground( Bool /*generateExposures*/ ); -extern void miMarkWindow( +extern _X_EXPORT void miMarkWindow( WindowPtr /*pWin*/ ); -extern Bool miMarkOverlappedWindows( +extern _X_EXPORT Bool miMarkOverlappedWindows( WindowPtr /*pWin*/, WindowPtr /*pFirst*/, WindowPtr * /*ppLayerWin*/ ); -extern void miHandleValidateExposures( +extern _X_EXPORT void miHandleValidateExposures( WindowPtr /*pWin*/ ); -extern void miMoveWindow( +extern _X_EXPORT void miMoveWindow( WindowPtr /*pWin*/, int /*x*/, int /*y*/, @@ -495,7 +495,7 @@ extern void miMoveWindow( VTKind /*kind*/ ); -extern void miSlideAndSizeWindow( +extern _X_EXPORT void miSlideAndSizeWindow( WindowPtr /*pWin*/, int /*x*/, int /*y*/, @@ -504,30 +504,30 @@ extern void miSlideAndSizeWindow( WindowPtr /*pSib*/ ); -extern WindowPtr miGetLayerWindow( +extern _X_EXPORT WindowPtr miGetLayerWindow( WindowPtr /*pWin*/ ); -extern void miSetShape( +extern _X_EXPORT void miSetShape( WindowPtr /*pWin*/ ); -extern void miChangeBorderWidth( +extern _X_EXPORT void miChangeBorderWidth( WindowPtr /*pWin*/, unsigned int /*width*/ ); -extern void miMarkUnrealizedWindow( +extern _X_EXPORT void miMarkUnrealizedWindow( WindowPtr /*pChild*/, WindowPtr /*pWin*/, Bool /*fromConfigure*/ ); -extern void miSegregateChildren(WindowPtr pWin, RegionPtr pReg, int depth); +extern _X_EXPORT void miSegregateChildren(WindowPtr pWin, RegionPtr pReg, int depth); /* mizerarc.c */ -extern void miZeroPolyArc( +extern _X_EXPORT void miZeroPolyArc( DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*narcs*/, @@ -536,7 +536,7 @@ extern void miZeroPolyArc( /* mizerline.c */ -extern void miZeroLine( +extern _X_EXPORT void miZeroLine( DrawablePtr /*dst*/, GCPtr /*pgc*/, int /*mode*/, @@ -544,7 +544,7 @@ extern void miZeroLine( DDXPointRec * /*pptInit*/ ); -extern void miZeroDashLine( +extern _X_EXPORT void miZeroDashLine( DrawablePtr /*dst*/, GCPtr /*pgc*/, int /*mode*/, @@ -552,7 +552,7 @@ extern void miZeroDashLine( DDXPointRec * /*pptInit*/ ); -extern void miPolyFillArc( +extern _X_EXPORT void miPolyFillArc( DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*narcs*/, diff --git a/mi/miarc.c b/mi/miarc.c index f0c863fd9..bec3391df 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -1041,7 +1041,7 @@ miFillWideEllipse( * fuller explanation of this.) */ -_X_EXPORT void +void miPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { int i; diff --git a/mi/mibank.c b/mi/mibank.c index 84f755988..3946a4b6d 100644 --- a/mi/mibank.c +++ b/mi/mibank.c @@ -1985,7 +1985,7 @@ miBankCopyWindow( xfree(pBoxNew1); } -_X_EXPORT Bool +Bool miInitializeBanking( ScreenPtr pScreen, unsigned int xsize, @@ -2210,7 +2210,7 @@ miInitializeBanking( * cannot exist. This function exists because the DDX needs to be able to * determine this width before initializing a frame buffer. */ -_X_EXPORT int +int miScanLineWidth( unsigned int xsize, /* pixels */ unsigned int ysize, /* pixels */ diff --git a/mi/mibank.h b/mi/mibank.h index 327507db9..0c10540a7 100644 --- a/mi/mibank.h +++ b/mi/mibank.h @@ -85,7 +85,7 @@ typedef struct _miBankInfo unsigned int nBankDepth; } miBankInfoRec, *miBankInfoPtr; -Bool +extern _X_EXPORT Bool miInitializeBanking( ScreenPtr /*pScreen*/, unsigned int /*xsize*/, @@ -99,7 +99,7 @@ miInitializeBanking( * and various screen attributes. DDX needs to determine this width before * initializing the screen. */ -int +extern _X_EXPORT int miScanLineWidth( unsigned int /*xsize*/, unsigned int /*ysize*/, diff --git a/mi/mibitblt.c b/mi/mibitblt.c index dbd2ed60f..a36e1aacb 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -73,7 +73,7 @@ extern int ffs(int); * set them in the destination with SetSpans * We let SetSpans worry about clipping to the destination. */ -_X_EXPORT RegionPtr +RegionPtr miCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -548,7 +548,7 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc, * build a source clip * Use the bitmap we've built up as a Stipple for the destination */ -_X_EXPORT RegionPtr +RegionPtr miCopyPlane( DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -643,7 +643,7 @@ miCopyPlane( DrawablePtr pSrcDrawable, * XY format: * get the single plane specified in planemask */ -_X_EXPORT void +void miGetImage( DrawablePtr pDraw, int sx, int sy, int w, int h, unsigned int format, unsigned long planeMask, char *pDst) { @@ -741,7 +741,7 @@ miGetImage( DrawablePtr pDraw, int sx, int sy, int w, int h, * ZPixmap format: * This part is simple, just call SetSpans */ -_X_EXPORT void +void miPutImage( DrawablePtr pDraw, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pImage) diff --git a/mi/mibstore.c b/mi/mibstore.c index 294b2caee..ef89a76c7 100644 --- a/mi/mibstore.c +++ b/mi/mibstore.c @@ -36,7 +36,7 @@ * for the implementation. */ -_X_EXPORT void +void miInitializeBackingStore (ScreenPtr pScreen) { pScreen->SaveDoomedAreas = NULL; diff --git a/mi/mibstore.h b/mi/mibstore.h index baa59202b..ef7e18790 100644 --- a/mi/mibstore.h +++ b/mi/mibstore.h @@ -18,7 +18,7 @@ #include "screenint.h" -extern void miInitializeBackingStore( +extern _X_EXPORT void miInitializeBackingStore( ScreenPtr /*pScreen*/ ); diff --git a/mi/micmap.c b/mi/micmap.c index b92ddece5..342756b6a 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -46,9 +46,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "globals.h" #include "micmap.h" -_X_EXPORT ColormapPtr miInstalledMaps[MAXSCREENS]; +ColormapPtr miInstalledMaps[MAXSCREENS]; -_X_EXPORT int +int miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) { if (miInstalledMaps[pScreen->myNum]) { @@ -58,7 +58,7 @@ miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) return 0; } -_X_EXPORT void +void miInstallColormap(ColormapPtr pmap) { int index = pmap->pScreen->myNum; @@ -77,7 +77,7 @@ miInstallColormap(ColormapPtr pmap) } } -_X_EXPORT void +void miUninstallColormap(ColormapPtr pmap) { int index = pmap->pScreen->myNum; @@ -94,7 +94,7 @@ miUninstallColormap(ColormapPtr pmap) } } -_X_EXPORT void +void miResolveColor(unsigned short *pred, unsigned short *pgreen, unsigned short *pblue, VisualPtr pVisual) { @@ -116,7 +116,7 @@ miResolveColor(unsigned short *pred, unsigned short *pgreen, } } -_X_EXPORT Bool +Bool miInitializeColormap(ColormapPtr pmap) { unsigned i; @@ -201,7 +201,7 @@ miInitializeColormap(ColormapPtr pmap) outdefs[i].blue = pmap->blue[blue >> pVisual->offsetBlue].co.local.blue; \ } -_X_EXPORT int +int miExpandDirectColors(ColormapPtr pmap, int ndef, xColorItem *indefs, xColorItem *outdefs) { @@ -261,7 +261,7 @@ miExpandDirectColors(ColormapPtr pmap, int ndef, xColorItem *indefs, return nresult; } -_X_EXPORT Bool +Bool miCreateDefColormap(ScreenPtr pScreen) { /* @@ -378,7 +378,7 @@ static int miVisualPriority[] = { static miVisualsPtr miVisuals; -_X_EXPORT void +void miClearVisualTypes(void) { miVisualsPtr v; @@ -390,7 +390,7 @@ miClearVisualTypes(void) } -_X_EXPORT Bool +Bool miSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB, int preferredCVC, Pixel redMask, Pixel greenMask, Pixel blueMask) @@ -424,14 +424,14 @@ miSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB, return TRUE; } -_X_EXPORT Bool +Bool miSetVisualTypes(int depth, int visuals, int bitsPerRGB, int preferredCVC) { return miSetVisualTypesAndMasks (depth, visuals, bitsPerRGB, preferredCVC, 0, 0, 0); } -_X_EXPORT int +int miGetDefaultVisualMask(int depth) { if (depth > MAX_PSEUDO_DEPTH) @@ -455,7 +455,7 @@ miVisualTypesSet (int depth) return FALSE; } -_X_EXPORT Bool +Bool miSetPixmapDepths (void) { int d, f; @@ -497,7 +497,7 @@ maskShift (Pixel p) * the set which can be used with this version of cfb. */ -_X_EXPORT Bool +Bool miInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, int *ndepthp, int *rootDepthp, VisualID *defaultVisp, unsigned long sizes, int bitsPerRGB, int preferredVis) diff --git a/mi/micmap.h b/mi/micmap.h index 667004b49..5c8448a95 100644 --- a/mi/micmap.h +++ b/mi/micmap.h @@ -4,29 +4,29 @@ #ifndef _MICMAP_H_ #define _MICMAP_H_ -extern ColormapPtr miInstalledMaps[MAXSCREENS]; +extern _X_EXPORT ColormapPtr miInstalledMaps[MAXSCREENS]; typedef Bool (* miInitVisualsProcPtr)(VisualPtr *, DepthPtr *, int *, int *, int *, VisualID *, unsigned long, int, int); -int miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps); -void miInstallColormap(ColormapPtr pmap); -void miUninstallColormap(ColormapPtr pmap); +extern _X_EXPORT int miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps); +extern _X_EXPORT void miInstallColormap(ColormapPtr pmap); +extern _X_EXPORT void miUninstallColormap(ColormapPtr pmap); -void miResolveColor(unsigned short *, unsigned short *, unsigned short *, +extern _X_EXPORT void miResolveColor(unsigned short *, unsigned short *, unsigned short *, VisualPtr); -Bool miInitializeColormap(ColormapPtr); -int miExpandDirectColors(ColormapPtr, int, xColorItem *, xColorItem *); -Bool miCreateDefColormap(ScreenPtr); -void miClearVisualTypes(void); -Bool miSetVisualTypes(int, int, int, int); -Bool miSetPixmapDepths(void); -Bool miSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB, +extern _X_EXPORT Bool miInitializeColormap(ColormapPtr); +extern _X_EXPORT int miExpandDirectColors(ColormapPtr, int, xColorItem *, xColorItem *); +extern _X_EXPORT Bool miCreateDefColormap(ScreenPtr); +extern _X_EXPORT void miClearVisualTypes(void); +extern _X_EXPORT Bool miSetVisualTypes(int, int, int, int); +extern _X_EXPORT Bool miSetPixmapDepths(void); +extern _X_EXPORT Bool miSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB, int preferredCVC, Pixel redMask, Pixel greenMask, Pixel blueMask); -int miGetDefaultVisualMask(int); -Bool miInitVisuals(VisualPtr *, DepthPtr *, int *, int *, int *, VisualID *, +extern _X_EXPORT int miGetDefaultVisualMask(int); +extern _X_EXPORT Bool miInitVisuals(VisualPtr *, DepthPtr *, int *, int *, int *, VisualID *, unsigned long, int, int); #define MAX_PSEUDO_DEPTH 10 diff --git a/mi/micursor.c b/mi/micursor.c index 8b1649039..f6ae8f488 100644 --- a/mi/micursor.c +++ b/mi/micursor.c @@ -54,7 +54,7 @@ SOFTWARE. #include "mi.h" #include "inputstr.h" -_X_EXPORT void +void miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr, CursorPtr pCurs, Bool displayed) { diff --git a/mi/midash.c b/mi/midash.c index 40c741b44..ba64d354f 100644 --- a/mi/midash.c +++ b/mi/midash.c @@ -52,7 +52,7 @@ SOFTWARE. #include "mistruct.h" #include "mifpoly.h" -_X_EXPORT void +void miStepDash ( int dist, /* distance to step */ int *pDashIndex, /* current dash */ diff --git a/mi/midispcur.c b/mi/midispcur.c index 05352fc89..4fd187cf6 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -136,7 +136,7 @@ static miSpriteCursorFuncRec miDCFuncs = { miDCDeviceCleanup }; -_X_EXPORT Bool +Bool miDCInitialize (ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs) { miDCScreenPtr pScreenPriv; @@ -81,7 +81,7 @@ typedef struct _EventQueue { static EventQueueRec miEventQueue; -_X_EXPORT Bool +Bool mieqInit(void) { int i; @@ -103,7 +103,7 @@ mieqInit(void) } /* Ensure all events in the EQ are at least size bytes. */ -_X_EXPORT void +void mieqResizeEvents(int min_size) { int i; @@ -119,7 +119,7 @@ mieqResizeEvents(int min_size) * called from regular code. */ -_X_EXPORT void +void mieqEnqueue(DeviceIntPtr pDev, xEvent *e) { unsigned int oldtail = miEventQueue.tail; @@ -219,7 +219,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e) miEventQueue.tail = (oldtail + 1) % QUEUE_SIZE; } -_X_EXPORT void +void mieqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool fromDIX) { EnqueueScreen(pDev) = pScreen; @@ -227,7 +227,7 @@ mieqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool fromDIX) DequeueScreen(pDev) = pScreen; } -_X_EXPORT void +void mieqSetHandler(int event, mieqHandler handler) { if (handler && miEventQueue.handlers[event]) @@ -300,7 +300,7 @@ CopyGetMasterEvent(DeviceIntPtr mdev, xEvent* original, } /* Call this from ProcessInputEvents(). */ -_X_EXPORT void +void mieqProcessInputEvents(void) { mieqHandler handler; diff --git a/mi/miexpose.c b/mi/miexpose.c index d1b64b54a..d1fa36510 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -127,7 +127,7 @@ exposing is done by the backing store's GraphicsExpose function, of course. */ -_X_EXPORT RegionPtr +RegionPtr miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, unsigned long plane) @@ -341,7 +341,7 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, /* send GraphicsExpose events, or a NoExpose event, based on the region */ -_X_EXPORT void +void miSendGraphicsExpose (ClientPtr client, RegionPtr pRgn, XID drawable, int major, int minor) { @@ -388,7 +388,7 @@ miSendGraphicsExpose (ClientPtr client, RegionPtr pRgn, XID drawable, } -_X_EXPORT void +void miSendExposures( WindowPtr pWin, RegionPtr pRgn, int dx, int dy) { BoxPtr pBox; @@ -448,7 +448,7 @@ miSendExposures( WindowPtr pWin, RegionPtr pRgn, int dx, int dy) xfree(pEvent); } -_X_EXPORT void +void miWindowExposures( WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed) { RegionPtr exposures = prgn; @@ -514,7 +514,7 @@ miWindowExposures( WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed) REGION_DESTROY( pWin->drawable.pScreen, exposures); } -_X_EXPORT void +void miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) { ScreenPtr pScreen = pWin->drawable.pScreen; @@ -636,7 +636,7 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) /* MICLEARDRAWABLE -- sets the entire drawable to the background color of * the GC. Useful when we have a scratch drawable and need to initialize * it. */ -_X_EXPORT void +void miClearDrawable(DrawablePtr pDraw, GCPtr pGC) { XID fg = pGC->fgPixel; diff --git a/mi/mifillarc.c b/mi/mifillarc.c index f2ab5ceb1..33a6e353a 100644 --- a/mi/mifillarc.c +++ b/mi/mifillarc.c @@ -52,7 +52,7 @@ Author: Bob Scheifler, MIT X Consortium #define Dsin(d) sin((double)d*(M_PI/11520.0)) #define Dcos(d) cos((double)d*(M_PI/11520.0)) -_X_EXPORT void +void miFillArcSetup(xArc *arc, miFillArcRec *info) { info->y = arc->height >> 1; @@ -304,7 +304,7 @@ miGetPieEdge( miGetArcEdge(arc, edge, k, top, left); } -_X_EXPORT void +void miFillArcSliceSetup(xArc *arc, miArcSliceRec *slice, GCPtr pGC) { int angle1, angle2; @@ -770,7 +770,7 @@ miFillArcSliceD( * Since we don't have to worry about overlapping segments, we can just * fill each arc as it comes. */ -_X_EXPORT void +void miPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { int i; diff --git a/mi/mifillarc.h b/mi/mifillarc.h index 3e3bb9858..11587540f 100644 --- a/mi/mifillarc.h +++ b/mi/mifillarc.h @@ -176,12 +176,12 @@ typedef struct _miArcSlice { #define miFillInArcLower(slw) (((iny + dy) != 0) && \ ((slw > 1) || (ine != inxk))) -extern void miFillArcSetup( +extern _X_EXPORT void miFillArcSetup( xArc * /*arc*/, miFillArcRec * /*info*/ ); -extern void miFillArcSliceSetup( +extern _X_EXPORT void miFillArcSliceSetup( xArc * /*arc*/, miArcSliceRec * /*slice*/, GCPtr /*pGC*/ diff --git a/mi/mifillrct.c b/mi/mifillrct.c index 06f018e27..a2967da0a 100644 --- a/mi/mifillrct.c +++ b/mi/mifillrct.c @@ -66,7 +66,7 @@ SOFTWARE. * then call FillSpans to fill each rectangle. We let FillSpans worry about * clipping to the destination */ -_X_EXPORT void +void miPolyFillRect( DrawablePtr pDrawable, GCPtr pGC, diff --git a/mi/mifpoly.h b/mi/mifpoly.h index 7bd77b356..ffd19a341 100644 --- a/mi/mifpoly.h +++ b/mi/mifpoly.h @@ -88,7 +88,7 @@ typedef struct _SppArc { /* mifpolycon.c */ -extern void miFillSppPoly( +extern _X_EXPORT void miFillSppPoly( DrawablePtr /*dst*/, GCPtr /*pgc*/, int /*count*/, diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c index 0ccc07554..4a3acfd2b 100644 --- a/mi/mifpolycon.c +++ b/mi/mifpolycon.c @@ -70,7 +70,7 @@ static int GetFPolyYBounds(SppPointPtr pts, int n, double yFtrans, * line algorithm with y as the major axis. There's some funny linear * interpolation involved because of the subpixel postioning. */ -_X_EXPORT void +void miFillSppPoly( DrawablePtr dst, GCPtr pgc, @@ -38,13 +38,13 @@ from The Open Group. #include "migc.h" /* ARGSUSED */ -_X_EXPORT void +void miChangeGC(GCPtr pGC, unsigned long mask) { return; } -_X_EXPORT void +void miDestroyGC(GCPtr pGC) { if (pGC->pRotatedPixmap) @@ -53,7 +53,7 @@ miDestroyGC(GCPtr pGC) REGION_DESTROY(pGC->pScreen, pGC->pCompositeClip); } -_X_EXPORT void +void miDestroyClip(GCPtr pGC) { if (pGC->clientClipType == CT_NONE) @@ -74,7 +74,7 @@ miDestroyClip(GCPtr pGC) pGC->clientClipType = CT_NONE; } -_X_EXPORT void +void miChangeClip( GCPtr pGC, int type, pointer pvalue, int nrects) { (*pGC->funcs->DestroyClip) (pGC); @@ -101,7 +101,7 @@ miChangeClip( GCPtr pGC, int type, pointer pvalue, int nrects) pGC->stateChanges |= GCClipMask; } -_X_EXPORT void +void miCopyClip(GCPtr pgcDst, GCPtr pgcSrc) { RegionPtr prgnNew; @@ -125,13 +125,13 @@ miCopyClip(GCPtr pgcDst, GCPtr pgcSrc) } /* ARGSUSED */ -_X_EXPORT void +void miCopyGC(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst) { return; } -_X_EXPORT void +void miComputeCompositeClip( GCPtr pGC, DrawablePtr pDrawable) { ScreenPtr pScreen; @@ -27,38 +27,38 @@ from The Open Group. */ -extern void miChangeGC( +extern _X_EXPORT void miChangeGC( GCPtr /*pGC*/, unsigned long /*mask*/ ); -extern void miDestroyGC( +extern _X_EXPORT void miDestroyGC( GCPtr /*pGC*/ ); -extern void miDestroyClip( +extern _X_EXPORT void miDestroyClip( GCPtr /*pGC*/ ); -extern void miChangeClip( +extern _X_EXPORT void miChangeClip( GCPtr /*pGC*/, int /*type*/, pointer /*pvalue*/, int /*nrects*/ ); -extern void miCopyClip( +extern _X_EXPORT void miCopyClip( GCPtr /*pgcDst*/, GCPtr /*pgcSrc*/ ); -extern void miCopyGC( +extern _X_EXPORT void miCopyGC( GCPtr /*pGCSrc*/, unsigned long /*changes*/, GCPtr /*pGCDst*/ ); -extern void miComputeCompositeClip( +extern _X_EXPORT void miComputeCompositeClip( GCPtr /*pGC*/, DrawablePtr /*pDrawable*/ ); diff --git a/mi/miglblt.c b/mi/miglblt.c index 414773608..404d78540 100644 --- a/mi/miglblt.c +++ b/mi/miglblt.c @@ -81,7 +81,7 @@ with the sample server. use the bitmap in a call to PushPixels */ -_X_EXPORT void +void miPolyGlyphBlt( DrawablePtr pDrawable, GC *pGC, @@ -197,7 +197,7 @@ miPolyGlyphBlt( } -_X_EXPORT void +void miImageGlyphBlt( DrawablePtr pDrawable, GC *pGC, diff --git a/mi/miinitext.c b/mi/miinitext.c index f669faaff..92d6cd2f0 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -353,7 +353,7 @@ static ExtensionToggle ExtensionToggleList[] = { NULL, NULL } }; -_X_EXPORT Bool EnableDisableExtension(char *name, Bool enable) +Bool EnableDisableExtension(char *name, Bool enable) { ExtensionToggle *ext = &ExtensionToggleList[0]; @@ -367,7 +367,7 @@ _X_EXPORT Bool EnableDisableExtension(char *name, Bool enable) return FALSE; } -_X_EXPORT void EnableDisableExtensionError(char *name, Bool enable) +void EnableDisableExtensionError(char *name, Bool enable) { ExtensionToggle *ext = &ExtensionToggleList[0]; @@ -381,7 +381,7 @@ _X_EXPORT void EnableDisableExtensionError(char *name, Bool enable) #ifndef XFree86LOADER /*ARGSUSED*/ -_X_EXPORT void +void InitExtensions(int argc, char *argv[]) { if (!noGEExtension) GEExtensionInit(); diff --git a/mi/miline.h b/mi/miline.h index 036c2b5df..e1dd6d553 100644 --- a/mi/miline.h +++ b/mi/miline.h @@ -77,7 +77,7 @@ in this Software without prior written authorization from The Open Group. * Jack E. Bresenham, IEEE CG&A, May 1987. */ -extern void miSetZeroLineBias( +extern _X_EXPORT void miSetZeroLineBias( ScreenPtr /* pScreen */, unsigned int /* bias */ ); @@ -148,9 +148,9 @@ extern void miSetZeroLineBias( #define IsXDecreasingOctant(_octant) ((_octant) & XDECREASING) #define IsYDecreasingOctant(_octant) ((_octant) & YDECREASING) -extern DevPrivateKey miZeroLineScreenKey; +extern _X_EXPORT DevPrivateKey miZeroLineScreenKey; -extern int miZeroClipLine( +extern _X_EXPORT int miZeroClipLine( int /*xmin*/, int /*ymin*/, int /*xmax*/, diff --git a/mi/mioverlay.c b/mi/mioverlay.c index 395b1aab2..f238cd3f2 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -102,7 +102,7 @@ static void miOverlayChangeBorderWidth(WindowPtr, unsigned int); HasBorder(w) && \ (w)->backgroundState == ParentRelative) -_X_EXPORT Bool +Bool miInitOverlay( ScreenPtr pScreen, miOverlayInOverlayFunc inOverlayFunc, @@ -1604,7 +1604,7 @@ miOverlayChangeBorderWidth( /* We need this as an addition since the xf86 common code doesn't know about the second tree which is static to this file. */ -_X_EXPORT void +void miOverlaySetRootClip(ScreenPtr pScreen, Bool enable) { WindowPtr pRoot = WindowTable[pScreen->myNum]; @@ -1688,7 +1688,7 @@ miOverlayClearToBackground( /****************************************************************/ /* not used */ -_X_EXPORT Bool +Bool miOverlayGetPrivateClips( WindowPtr pWin, RegionPtr *borderClip, @@ -1707,7 +1707,7 @@ miOverlayGetPrivateClips( return FALSE; } -_X_EXPORT void +void miOverlaySetTransFunction ( ScreenPtr pScreen, miOverlayTransFunc transFunc @@ -1715,13 +1715,13 @@ miOverlaySetTransFunction ( MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->MakeTransparent = transFunc; } -_X_EXPORT Bool +Bool miOverlayCopyUnderlay(ScreenPtr pScreen) { return MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->copyUnderlay; } -_X_EXPORT void +void miOverlayComputeCompositeClip(GCPtr pGC, WindowPtr pWin) { ScreenPtr pScreen = pGC->pScreen; @@ -1777,7 +1777,7 @@ miOverlayComputeCompositeClip(GCPtr pGC, WindowPtr pWin) } } -_X_EXPORT Bool +Bool miOverlayCollectUnderlayRegions( WindowPtr pWin, RegionPtr *region diff --git a/mi/mioverlay.h b/mi/mioverlay.h index 24b74f51c..dca65ad37 100644 --- a/mi/mioverlay.h +++ b/mi/mioverlay.h @@ -9,24 +9,24 @@ typedef void (*miOverlayTransFunc)(ScreenPtr, int, BoxPtr); typedef Bool (*miOverlayInOverlayFunc)(WindowPtr); -Bool +extern _X_EXPORT Bool miInitOverlay( ScreenPtr pScreen, miOverlayInOverlayFunc inOverlay, miOverlayTransFunc trans ); -Bool +extern _X_EXPORT Bool miOverlayGetPrivateClips( WindowPtr pWin, RegionPtr *borderClip, RegionPtr *clipList ); -Bool miOverlayCollectUnderlayRegions(WindowPtr, RegionPtr*); -void miOverlayComputeCompositeClip(GCPtr, WindowPtr); -Bool miOverlayCopyUnderlay(ScreenPtr); -void miOverlaySetTransFunction(ScreenPtr, miOverlayTransFunc); -void miOverlaySetRootClip(ScreenPtr, Bool); +extern _X_EXPORT Bool miOverlayCollectUnderlayRegions(WindowPtr, RegionPtr*); +extern _X_EXPORT void miOverlayComputeCompositeClip(GCPtr, WindowPtr); +extern _X_EXPORT Bool miOverlayCopyUnderlay(ScreenPtr); +extern _X_EXPORT void miOverlaySetTransFunction(ScreenPtr, miOverlayTransFunc); +extern _X_EXPORT void miOverlaySetRootClip(ScreenPtr, Bool); #endif /* __MIOVERLAY_H */ diff --git a/mi/mipointer.c b/mi/mipointer.c index da4ea9423..89b1606c6 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -42,7 +42,7 @@ in this Software without prior written authorization from The Open Group. # include "inputstr.h" static int miPointerScreenKeyIndex; -_X_EXPORT DevPrivateKey miPointerScreenKey = &miPointerScreenKeyIndex; +DevPrivateKey miPointerScreenKey = &miPointerScreenKeyIndex; #define GetScreenPrivate(s) ((miPointerScreenPtr) \ dixLookupPrivate(&(s)->devPrivates, miPointerScreenKey)) @@ -81,7 +81,7 @@ static void miPointerDeviceCleanup(DeviceIntPtr pDev, static EventList* events; /* for WarpPointer MotionNotifies */ -_X_EXPORT Bool +Bool miPointerInitialize (ScreenPtr pScreen, miPointerSpriteFuncPtr spriteFuncs, miPointerScreenFuncPtr screenFuncs, @@ -297,7 +297,7 @@ miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) /* Once signals are ignored, the WarpCursor function can call this */ -_X_EXPORT void +void miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) { miPointerPtr pPointer; @@ -346,7 +346,7 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) * Syncronize the sprite with the cursor - called from ProcessInputEvents */ -_X_EXPORT void +void miPointerUpdateSprite (DeviceIntPtr pDev) { ScreenPtr pScreen; @@ -419,7 +419,7 @@ miPointerUpdateSprite (DeviceIntPtr pDev) } } -_X_EXPORT void +void miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y) { miPointerScreenPtr pScreenPriv; @@ -437,13 +437,13 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y) pPointer->limits.y2 = pScreen->height; } -_X_EXPORT ScreenPtr +ScreenPtr miPointerCurrentScreen () { return miPointerGetScreen(inputInfo.pointer); } -_X_EXPORT ScreenPtr +ScreenPtr miPointerGetScreen(DeviceIntPtr pDev) { miPointerPtr pPointer = MIPOINTER(pDev); @@ -453,7 +453,7 @@ miPointerGetScreen(DeviceIntPtr pDev) /* Move the pointer to x, y on the current screen, update the sprite, and * the motion history. Generates no events. Does not return changed x * and y if they are clipped; use miPointerSetPosition instead. */ -_X_EXPORT void +void miPointerAbsoluteCursor (int x, int y, unsigned long time) { miPointerSetPosition(inputInfo.pointer, &x, &y); @@ -487,7 +487,7 @@ miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, pPointer->pScreen = pScreen; } -_X_EXPORT void +void miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y) { miPointerScreenPtr pScreenPriv; @@ -540,7 +540,7 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y) miPointerMoved(pDev, pScreen, *x, *y); } -_X_EXPORT void +void miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y) { *x = MIPOINTER(pDev)->x; diff --git a/mi/mipointer.h b/mi/mipointer.h index c004ba4b0..83277e46c 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -91,19 +91,19 @@ typedef struct _miPointerScreenFuncRec { ); } miPointerScreenFuncRec, *miPointerScreenFuncPtr; -extern Bool miDCInitialize( +extern _X_EXPORT Bool miDCInitialize( ScreenPtr /*pScreen*/, miPointerScreenFuncPtr /*screenFuncs*/ ); -extern Bool miPointerInitialize( +extern _X_EXPORT Bool miPointerInitialize( ScreenPtr /*pScreen*/, miPointerSpriteFuncPtr /*spriteFuncs*/, miPointerScreenFuncPtr /*screenFuncs*/, Bool /*waitForUpdate*/ ); -extern void miPointerWarpCursor( +extern _X_EXPORT void miPointerWarpCursor( DeviceIntPtr /*pDev*/, ScreenPtr /*pScreen*/, int /*x*/, @@ -111,41 +111,41 @@ extern void miPointerWarpCursor( ) _X_DEPRECATED; /* Deprecated in favour of miPointerSetPosition. */ -extern void miPointerAbsoluteCursor( +extern _X_EXPORT void miPointerAbsoluteCursor( int /*x*/, int /*y*/, unsigned long /*time*/ ) _X_DEPRECATED; /* Deprecated in favour of miPointerGetScreen. */ -extern ScreenPtr miPointerCurrentScreen( +extern _X_EXPORT ScreenPtr miPointerCurrentScreen( void ) _X_DEPRECATED; -extern ScreenPtr miPointerGetScreen( +extern _X_EXPORT ScreenPtr miPointerGetScreen( DeviceIntPtr pDev); -extern void miPointerSetScreen( +extern _X_EXPORT void miPointerSetScreen( DeviceIntPtr pDev, int screen_num, int x, int y); /* Returns the current cursor position. */ -extern void miPointerGetPosition( +extern _X_EXPORT void miPointerGetPosition( DeviceIntPtr pDev, int *x, int *y); /* Moves the cursor to the specified position. May clip the co-ordinates: * x and y are modified in-place. */ -extern void miPointerSetPosition( +extern _X_EXPORT void miPointerSetPosition( DeviceIntPtr pDev, int *x, int *y); -extern void miPointerUpdateSprite( +extern _X_EXPORT void miPointerUpdateSprite( DeviceIntPtr pDev); -extern DevPrivateKey miPointerScreenKey; +extern _X_EXPORT DevPrivateKey miPointerScreenKey; #endif /* MIPOINTER_H */ diff --git a/mi/mipoly.c b/mi/mipoly.c index 5ec4bfd6a..b3e2c2fb1 100644 --- a/mi/mipoly.c +++ b/mi/mipoly.c @@ -66,7 +66,7 @@ SOFTWARE. #include "regionstr.h" -_X_EXPORT void +void miFillPolygon( DrawablePtr dst, GCPtr pgc, int shape, int mode, int count, DDXPointPtr pPts) diff --git a/mi/mipoly.h b/mi/mipoly.h index c1bab4943..d94796e2f 100644 --- a/mi/mipoly.h +++ b/mi/mipoly.h @@ -180,7 +180,7 @@ typedef struct _ScanLineListBlock { /* mipolyutil.c */ -extern Bool miCreateETandAET( +extern _X_EXPORT Bool miCreateETandAET( int /*count*/, DDXPointPtr /*pts*/, EdgeTable * /*ET*/, @@ -189,19 +189,19 @@ extern Bool miCreateETandAET( ScanLineListBlock * /*pSLLBlock*/ ); -extern void miloadAET( +extern _X_EXPORT void miloadAET( EdgeTableEntry * /*AET*/, EdgeTableEntry * /*ETEs*/ ); -extern void micomputeWAET( +extern _X_EXPORT void micomputeWAET( EdgeTableEntry * /*AET*/ ); -extern int miInsertionSort( +extern _X_EXPORT int miInsertionSort( EdgeTableEntry * /*AET*/ ); -extern void miFreeStorage( +extern _X_EXPORT void miFreeStorage( ScanLineListBlock * /*pSLLBlock*/ ); diff --git a/mi/mipolycon.c b/mi/mipolycon.c index 085bed3c6..6e3889621 100644 --- a/mi/mipolycon.c +++ b/mi/mipolycon.c @@ -71,7 +71,7 @@ static int getPolyYBounds(DDXPointPtr pts, int n, int *by, int *ty); * For a derivation of the algorithm, see the author of * this code. */ -_X_EXPORT Bool +Bool miFillConvexPoly( DrawablePtr dst, GCPtr pgc, diff --git a/mi/mipolygen.c b/mi/mipolygen.c index 400d54dbe..04bc2c67f 100644 --- a/mi/mipolygen.c +++ b/mi/mipolygen.c @@ -65,7 +65,7 @@ SOFTWARE. * See fillpoly.h for a complete description of the algorithm. */ -_X_EXPORT Bool +Bool miFillGeneralPoly( DrawablePtr dst, GCPtr pgc, diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c index d16a95158..12324b686 100644 --- a/mi/mipolypnt.c +++ b/mi/mipolypnt.c @@ -55,7 +55,7 @@ SOFTWARE. #include "windowstr.h" #include "mi.h" -_X_EXPORT void +void miPolyPoint( DrawablePtr pDrawable, GCPtr pGC, diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c index e7504ef16..f1ec4858a 100644 --- a/mi/mipolyrect.c +++ b/mi/mipolyrect.c @@ -55,7 +55,7 @@ SOFTWARE. #include "pixmap.h" #include "mi.h" -_X_EXPORT void +void miPolyRectangle(DrawablePtr pDraw, GCPtr pGC, int nrects, xRectangle *pRects) { int i; diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c index 0832a601b..bf7f0f92e 100644 --- a/mi/mipolyseg.c +++ b/mi/mipolyseg.c @@ -66,7 +66,7 @@ SOFTWARE. *****************************************************************/ -_X_EXPORT void +void miPolySegment(DrawablePtr pDraw, GCPtr pGC, int nseg, xSegment *pSegs) { int i; diff --git a/mi/mipolytext.c b/mi/mipolytext.c index 7be40aef1..508e0ffa7 100644 --- a/mi/mipolytext.c +++ b/mi/mipolytext.c @@ -66,7 +66,7 @@ SOFTWARE. #include "dixfontstr.h" #include "mi.h" -_X_EXPORT int +int miPolyText8(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, char *chars) { unsigned long n, i; @@ -83,7 +83,7 @@ miPolyText8(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, char *chars) return x+w; } -_X_EXPORT int +int miPolyText16(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, unsigned short *chars) { unsigned long n, i; @@ -101,7 +101,7 @@ miPolyText16(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, unsigned sho return x+w; } -_X_EXPORT void +void miImageText8(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, char *chars) { unsigned long n; @@ -114,7 +114,7 @@ miImageText8(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, char *chars) (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, x, y, n, charinfo, FONTGLYPHS(font)); } -_X_EXPORT void +void miImageText16(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, unsigned short *chars) { diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index 87ca1445e..4b9789047 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -92,7 +92,7 @@ bitsizeof(int) padding and sacnline unit == bitsizeof(int).) * in order to have both (MSB_FIRST and LSB_FIRST) versions of this * in the server, we need to rename one of them */ -_X_EXPORT void +void miPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, int dx, int dy, int xOrg, int yOrg) { diff --git a/mi/miregion.c b/mi/miregion.c index c03a68c93..d9c6fb252 100644 --- a/mi/miregion.c +++ b/mi/miregion.c @@ -218,13 +218,13 @@ if (((numRects) < ((reg)->data->size >> 1)) && ((reg)->data->size > 50)) \ } -_X_EXPORT BoxRec miEmptyBox = {0, 0, 0, 0}; -_X_EXPORT RegDataRec miEmptyData = {0, 0}; +BoxRec miEmptyBox = {0, 0, 0, 0}; +RegDataRec miEmptyData = {0, 0}; -_X_EXPORT RegDataRec miBrokenData = {0, 0}; +RegDataRec miBrokenData = {0, 0}; static RegionRec miBrokenRegion = { { 0, 0, 0, 0 }, &miBrokenData }; -_X_EXPORT void +void InitRegions (void) { pixman_region_set_static_pointers (&miEmptyBox, &miEmptyData, &miBrokenData); @@ -236,7 +236,7 @@ InitRegions (void) * REGION of "size" number of rectangles. *****************************************************************/ -_X_EXPORT RegionPtr +RegionPtr miRegionCreate(BoxPtr rect, int size) { RegionPtr pReg; @@ -250,7 +250,7 @@ miRegionCreate(BoxPtr rect, int size) return(pReg); } -_X_EXPORT void +void miRegionDestroy(RegionPtr pReg) { pixman_region_fini (pReg); @@ -258,7 +258,7 @@ miRegionDestroy(RegionPtr pReg) xfree(pReg); } -_X_EXPORT void +void miPrintRegion(RegionPtr rgn) { int num, size; @@ -277,14 +277,14 @@ miPrintRegion(RegionPtr rgn) ErrorF("[mi] \n"); } -_X_EXPORT Bool +Bool miRegionEqual(RegionPtr reg1, RegionPtr reg2) { return pixman_region_equal (reg1, reg2); } #ifdef DEBUG -_X_EXPORT Bool +Bool miValidRegion(RegionPtr reg) { int i, numRects; @@ -335,7 +335,7 @@ miValidRegion(RegionPtr reg) * Outer region rect is statically allocated. *****************************************************************/ -_X_EXPORT void +void miRegionInit(RegionPtr pReg, BoxPtr rect, int size) { if (rect) @@ -344,13 +344,13 @@ miRegionInit(RegionPtr pReg, BoxPtr rect, int size) pixman_region_init (pReg); } -_X_EXPORT void +void miRegionUninit(RegionPtr pReg) { pixman_region_fini (pReg); } -_X_EXPORT Bool +Bool miRegionBreak (RegionPtr pReg) { xfreeData (pReg); @@ -359,7 +359,7 @@ miRegionBreak (RegionPtr pReg) return FALSE; } -_X_EXPORT Bool +Bool miRectAlloc(RegionPtr pRgn, int n) { RegDataPtr data; @@ -398,7 +398,7 @@ miRectAlloc(RegionPtr pRgn, int n) return TRUE; } -_X_EXPORT Bool +Bool miRegionCopy(RegionPtr dst, RegionPtr src) { return pixman_region_copy (dst, src); @@ -891,7 +891,7 @@ miSetExtents (RegionPtr pReg) *----------------------------------------------------------------------- */ /*ARGSUSED*/ -_X_EXPORT Bool +Bool miIntersect( RegionPtr newReg, /* destination Region */ RegionPtr reg1, @@ -995,7 +995,7 @@ miUnionO ( return TRUE; } -_X_EXPORT Bool +Bool miUnion( RegionPtr newReg, /* destination Region */ RegionPtr reg1, @@ -1026,7 +1026,7 @@ miUnion( * dstrgn is modified if rgn has rectangles. * */ -_X_EXPORT Bool +Bool miRegionAppend(RegionPtr dstrgn, RegionPtr rgn) { int numRects, dnumRects, size; @@ -1210,7 +1210,7 @@ QuickSortRects( *----------------------------------------------------------------------- */ -_X_EXPORT Bool +Bool miRegionValidate(RegionPtr badreg, Bool *pOverlap) { /* Descriptor for regions under construction in Step 2. */ @@ -1399,7 +1399,7 @@ bail: return miRegionBreak (badreg); } -_X_EXPORT RegionPtr +RegionPtr miRectsToRegion(int nrects, xRectangle *prect, int ctype) { @@ -1513,7 +1513,7 @@ miRectsToRegion(int nrects, xRectangle *prect, int ctype) * *----------------------------------------------------------------------- */ -_X_EXPORT Bool +Bool miSubtract(RegionPtr regD, RegionPtr regM, RegionPtr regS) { return pixman_region_subtract (regD, regM, regS); @@ -1538,7 +1538,7 @@ miSubtract(RegionPtr regD, RegionPtr regM, RegionPtr regS) * *----------------------------------------------------------------------- */ -_X_EXPORT Bool +Bool miInverse( RegionPtr newReg, /* Destination region */ RegionPtr reg1, /* Region to invert */ @@ -1547,7 +1547,7 @@ miInverse( { return pixman_region_inverse (newReg, reg1, invRect); } -_X_EXPORT int +int miRectIn(RegionPtr region, BoxPtr prect) { return pixman_region_contains_rectangle (region, prect); @@ -1557,19 +1557,19 @@ miRectIn(RegionPtr region, BoxPtr prect) translates in place */ -_X_EXPORT void +void miTranslateRegion(RegionPtr pReg, int x, int y) { pixman_region_translate (pReg, x, y); } -_X_EXPORT void +void miRegionReset(RegionPtr pReg, BoxPtr pBox) { pixman_region_reset (pReg, pBox); } -_X_EXPORT Bool +Bool miPointInRegion( RegionPtr pReg, int x, @@ -1580,20 +1580,20 @@ miPointInRegion( return pixman_region_contains_point (pReg, x, y, box); } -_X_EXPORT Bool +Bool miRegionNotEmpty(RegionPtr pReg) { return pixman_region_not_empty (pReg); } -_X_EXPORT Bool +Bool miRegionBroken(RegionPtr pReg) { good(pReg); return (REGION_NAR(pReg)); } -_X_EXPORT void +void miRegionEmpty(RegionPtr pReg) { good(pReg); @@ -1603,7 +1603,7 @@ miRegionEmpty(RegionPtr pReg) pReg->data = &miEmptyData; } -_X_EXPORT BoxPtr +BoxPtr miRegionExtents(RegionPtr pReg) { good(pReg); @@ -1728,7 +1728,7 @@ static void QuickSortSpans( returns the number of new, clipped scanlines. */ -_X_EXPORT int +int miClipSpans( RegionPtr prgnDst, DDXPointPtr ppt, diff --git a/mi/miscrinit.c b/mi/miscrinit.c index 7bcb4adb7..92b3981aa 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -60,7 +60,7 @@ typedef struct /* this plugs into pScreen->ModifyPixmapHeader */ -_X_EXPORT Bool +Bool miModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth, int bitsPerPixel, int devKind, pointer pPixData) { @@ -132,7 +132,7 @@ miCloseScreen (int iScreen, ScreenPtr pScreen) * possible private-requesting modules have been inited; we create the * screen pixmap here. */ -_X_EXPORT Bool +Bool miCreateScreenResources(ScreenPtr pScreen) { miScreenInitParmsPtr pScrInitParms; @@ -171,7 +171,7 @@ miCreateScreenResources(ScreenPtr pScreen) return TRUE; } -_X_EXPORT Bool +Bool miScreenDevPrivateInit(ScreenPtr pScreen, int width, pointer pbits) { miScreenInitParmsPtr pScrInitParms; @@ -202,7 +202,7 @@ miSetScreenPixmap(PixmapPtr pPix) pPix->drawable.pScreen->devPrivate = (pointer)pPix; } -_X_EXPORT Bool +Bool miScreenInit( ScreenPtr pScreen, pointer pbits, /* pointer to screen bits */ @@ -296,16 +296,16 @@ miScreenInit( static int privateKeyIndex; static DevPrivateKey privateKey = &privateKeyIndex; -_X_EXPORT DevPrivateKey +DevPrivateKey miAllocateGCPrivateIndex() { return privateKey; } static int miZeroLineScreenKeyIndex; -_X_EXPORT DevPrivateKey miZeroLineScreenKey = &miZeroLineScreenKeyIndex; +DevPrivateKey miZeroLineScreenKey = &miZeroLineScreenKeyIndex; -_X_EXPORT void +void miSetZeroLineBias(ScreenPtr pScreen, unsigned int bias) { dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, (pointer)bias); diff --git a/mi/mispans.c b/mi/mispans.c index 978588979..e59d711ae 100644 --- a/mi/mispans.c +++ b/mi/mispans.c @@ -65,7 +65,7 @@ Written by Joel McCormack, Summer 1989. */ -_X_EXPORT void miInitSpanGroup(spanGroup) +void miInitSpanGroup(spanGroup) SpanGroup *spanGroup; { spanGroup->size = 0; @@ -181,7 +181,7 @@ static void miSubtractSpans (SpanGroup *spanGroup, Spans *sub) } } -_X_EXPORT void miAppendSpans(SpanGroup *spanGroup, SpanGroup *otherGroup, Spans *spans) +void miAppendSpans(SpanGroup *spanGroup, SpanGroup *otherGroup, Spans *spans) { int ymin, ymax; int spansCount; @@ -214,7 +214,7 @@ _X_EXPORT void miAppendSpans(SpanGroup *spanGroup, SpanGroup *otherGroup, Spans } } /* AppendSpans */ -_X_EXPORT void miFreeSpanGroup(SpanGroup *spanGroup) +void miFreeSpanGroup(SpanGroup *spanGroup) { if (spanGroup->group != NULL) xfree(spanGroup->group); } @@ -372,7 +372,7 @@ miDisposeSpanGroup (SpanGroup *spanGroup) } } -_X_EXPORT void miFillUniqueSpanGroup(DrawablePtr pDraw, GCPtr pGC, SpanGroup *spanGroup) +void miFillUniqueSpanGroup(DrawablePtr pDraw, GCPtr pGC, SpanGroup *spanGroup) { int i; Spans *spans; diff --git a/mi/mispans.h b/mi/mispans.h index 258b29279..e3f033bab 100644 --- a/mi/mispans.h +++ b/mi/mispans.h @@ -60,30 +60,30 @@ typedef struct { } SpanGroup; /* Initialize SpanGroup. MUST BE DONE before use. */ -extern void miInitSpanGroup( +extern _X_EXPORT void miInitSpanGroup( SpanGroup * /*spanGroup*/ ); /* Add a Spans to a SpanGroup. The spans MUST BE in y-sorted order */ -extern void miAppendSpans( +extern _X_EXPORT void miAppendSpans( SpanGroup * /*spanGroup*/, SpanGroup * /*otherGroup*/, Spans * /*spans*/ ); /* Paint a span group, insuring that each pixel is painted at most once */ -extern void miFillUniqueSpanGroup( +extern _X_EXPORT void miFillUniqueSpanGroup( DrawablePtr /*pDraw*/, GCPtr /*pGC*/, SpanGroup * /*spanGroup*/ ); /* Free up data in a span group. MUST BE DONE or you'll suffer memory leaks */ -extern void miFreeSpanGroup( +extern _X_EXPORT void miFreeSpanGroup( SpanGroup * /*spanGroup*/ ); -extern int miClipSpans( +extern _X_EXPORT int miClipSpans( RegionPtr /*prgnDst*/, DDXPointPtr /*ppt*/, int * /*pwidth*/, diff --git a/mi/misprite.c b/mi/misprite.c index 692e6c97a..da6fc5519 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -160,7 +160,7 @@ static void miSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, static void miSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y); -_X_EXPORT miPointerSpriteFuncRec miSpritePointerFuncs = { +miPointerSpriteFuncRec miSpritePointerFuncs = { miSpriteRealizeCursor, miSpriteUnrealizeCursor, miSpriteSetCursor, diff --git a/mi/mivaltree.c b/mi/mivaltree.c index bb8bce3a5..2585422bc 100644 --- a/mi/mivaltree.c +++ b/mi/mivaltree.c @@ -106,7 +106,7 @@ Equipment Corporation. /* * Compute the visibility of a shaped window */ -_X_EXPORT int +int miShapedWindowIn (ScreenPtr pScreen, RegionPtr universe, RegionPtr bounding, BoxPtr rect, int x, int y) { @@ -166,7 +166,7 @@ miShapedWindowIn (ScreenPtr pScreen, RegionPtr universe, RegionPtr bounding, static GetRedirectBorderClipProcPtr miGetRedirectBorderClipProc; static SetRedirectBorderClipProcPtr miSetRedirectBorderClipProc; -_X_EXPORT void +void miRegisterRedirectBorderClipProc (SetRedirectBorderClipProcPtr setBorderClip, GetRedirectBorderClipProcPtr getBorderClip) { @@ -589,7 +589,7 @@ miTreeObscured( *----------------------------------------------------------------------- */ /*ARGSUSED*/ -_X_EXPORT int +int miValidateTree ( WindowPtr pParent, /* Parent to validate */ WindowPtr pChild, /* First child of pParent that was diff --git a/mi/miwideline.c b/mi/miwideline.c index 40f0d3e49..5c16d3ccc 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -251,7 +251,7 @@ miFillRectPolyHelper ( } } -_X_EXPORT /* static */ int +/* static */ int miPolyBuildEdge ( double x0, double y0, @@ -313,7 +313,7 @@ miPolyBuildEdge ( #define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr))) -_X_EXPORT /* static */ int +/* static */ int miPolyBuildPoly ( PolyVertexPtr vertices, PolySlopePtr slopes, @@ -915,7 +915,7 @@ miRoundJoinFace (LineFacePtr face, PolyEdgePtr edge, Bool *leftEdge) return y; } -_X_EXPORT void +void miRoundJoinClip (LineFacePtr pLeft, LineFacePtr pRight, PolyEdgePtr edge1, PolyEdgePtr edge2, int *y1, int *y2, Bool *left1, Bool *left2) @@ -938,7 +938,7 @@ miRoundJoinClip (LineFacePtr pLeft, LineFacePtr pRight, *y2 = miRoundJoinFace (pRight, edge2, left2); } -_X_EXPORT int +int miRoundCapClip (LineFacePtr face, Bool isInt, PolyEdgePtr edge, Bool *leftEdge) { int y; @@ -1524,7 +1524,7 @@ miCleanupSpanData (DrawablePtr pDrawable, GCPtr pGC, SpanDataPtr spanData) miFreeSpanGroup (&spanData->fgGroup); } -_X_EXPORT void +void miWideLine (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pPts) { @@ -2018,7 +2018,7 @@ miWideDashSegment ( *pDashOffset = pDash[dashIndex] - dashRemain; } -_X_EXPORT void +void miWideDash (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pPts) { diff --git a/mi/miwideline.h b/mi/miwideline.h index 9d1aa03cb..1f615d689 100644 --- a/mi/miwideline.h +++ b/mi/miwideline.h @@ -153,7 +153,7 @@ typedef struct _LineFace { } \ } -extern void miRoundJoinClip( +extern _X_EXPORT void miRoundJoinClip( LineFacePtr /*pLeft*/, LineFacePtr /*pRight*/, PolyEdgePtr /*edge1*/, @@ -164,16 +164,16 @@ extern void miRoundJoinClip( Bool * /*left2*/ ); -extern int miRoundCapClip( +extern _X_EXPORT int miRoundCapClip( LineFacePtr /*face*/, Bool /*isInt*/, PolyEdgePtr /*edge*/, Bool * /*leftEdge*/ ); -extern int miPolyBuildEdge(double x0, double y0, double k, int dx, int dy, +extern _X_EXPORT int miPolyBuildEdge(double x0, double y0, double k, int dx, int dy, int xi, int yi, int left, PolyEdgePtr edge); -extern int miPolyBuildPoly(PolyVertexPtr vertices, PolySlopePtr slopes, +extern _X_EXPORT int miPolyBuildPoly(PolyVertexPtr vertices, PolySlopePtr slopes, int count, int xi, int yi, PolyEdgePtr left, PolyEdgePtr right, int *pnleft, int *pnright, int *h); diff --git a/mi/miwindow.c b/mi/miwindow.c index 8e4be64e5..e2af77d48 100644 --- a/mi/miwindow.c +++ b/mi/miwindow.c @@ -57,7 +57,7 @@ SOFTWARE. #include "pixmapstr.h" #include "mivalidate.h" -_X_EXPORT void +void miClearToBackground(WindowPtr pWin, int x, int y, int w, int h, Bool generateExposures) @@ -122,7 +122,7 @@ miClearToBackground(WindowPtr pWin, REGION_DESTROY(pScreen, pBSReg); } -_X_EXPORT void +void miMarkWindow(WindowPtr pWin) { ValidatePtr val; @@ -137,7 +137,7 @@ miMarkWindow(WindowPtr pWin) pWin->valdata = val; } -_X_EXPORT Bool +Bool miMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst, WindowPtr *ppLayerWin) { BoxPtr box; @@ -223,7 +223,7 @@ miMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst, WindowPtr *ppLayerWin) * regions, translate the regions, restore any backing store, * and then send any regions still exposed to the client *****/ -_X_EXPORT void +void miHandleValidateExposures(WindowPtr pWin) { WindowPtr pChild; @@ -260,7 +260,7 @@ miHandleValidateExposures(WindowPtr pWin) } } -_X_EXPORT void +void miMoveWindow(WindowPtr pWin, int x, int y, WindowPtr pNextSib, VTKind kind) { WindowPtr pParent; @@ -369,7 +369,7 @@ miRecomputeExposures ( return WT_NOMATCH; } -_X_EXPORT void +void miSlideAndSizeWindow(WindowPtr pWin, int x, int y, unsigned int w, unsigned int h, @@ -681,7 +681,7 @@ miSlideAndSizeWindow(WindowPtr pWin, WindowsRestructured (); } -_X_EXPORT WindowPtr +WindowPtr miGetLayerWindow(WindowPtr pWin) { return pWin->firstChild; @@ -694,7 +694,7 @@ miGetLayerWindow(WindowPtr pWin) * and send appropriate exposure events */ -_X_EXPORT void +void miSetShape(WindowPtr pWin) { Bool WasViewable = (Bool)(pWin->viewable); @@ -750,7 +750,7 @@ miSetShape(WindowPtr pWin) /* Keeps the same inside(!) origin */ -_X_EXPORT void +void miChangeBorderWidth(WindowPtr pWin, unsigned int width) { int oldwidth; @@ -804,7 +804,7 @@ miChangeBorderWidth(WindowPtr pWin, unsigned int width) WindowsRestructured (); } -_X_EXPORT void +void miMarkUnrealizedWindow(WindowPtr pChild, WindowPtr pWin, Bool fromConfigure) { if ((pChild != pWin) || fromConfigure) @@ -816,7 +816,7 @@ miMarkUnrealizedWindow(WindowPtr pChild, WindowPtr pWin, Bool fromConfigure) } } -_X_EXPORT void +void miSegregateChildren(WindowPtr pWin, RegionPtr pReg, int depth) { ScreenPtr pScreen; diff --git a/mi/mizerarc.c b/mi/mizerarc.c index d3cc1958c..83a269d46 100644 --- a/mi/mizerarc.c +++ b/mi/mizerarc.c @@ -95,7 +95,7 @@ static miZeroArcPtRec oob = {65536, 65536, 0}; * */ -_X_EXPORT Bool +Bool miZeroArcSetup(xArc *arc, miZeroArcRec *info, Bool ok360) { int l; @@ -702,7 +702,7 @@ miZeroArcDashPts( dinfo->dashOffset = pGC->dash[dinfo->dashIndex] - dashRemaining; } -_X_EXPORT void +void miZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { int maxPts = 0; diff --git a/mi/mizerarc.h b/mi/mizerarc.h index 28ebbe030..1612a525b 100644 --- a/mi/mizerarc.h +++ b/mi/mizerarc.h @@ -119,7 +119,7 @@ typedef struct { /* mizerarc.c */ -extern Bool miZeroArcSetup( +extern _X_EXPORT Bool miZeroArcSetup( xArc * /*arc*/, miZeroArcRec * /*info*/, Bool /*ok360*/ diff --git a/mi/mizerclip.c b/mi/mizerclip.c index dd05040bc..fb1e25fe4 100644 --- a/mi/mizerclip.c +++ b/mi/mizerclip.c @@ -404,7 +404,7 @@ the numerator is therefore (2^32 - 1), which does not overflow an unsigned * -1 for completely clipped line * */ -_X_EXPORT int +int miZeroClipLine(int xmin, int ymin, int xmax, int ymax, int *new_x1, int *new_y1, int *new_x2, int *new_y2, unsigned int adx, unsigned int ady, diff --git a/mi/mizerline.c b/mi/mizerline.c index e1e8e6e69..d9ecd89fa 100644 --- a/mi/mizerline.c +++ b/mi/mizerline.c @@ -97,7 +97,7 @@ SOFTWARE. }\ } -_X_EXPORT void +void miZeroLine( DrawablePtr pDraw, GCPtr pGC, @@ -363,7 +363,7 @@ miZeroLine( xfree(pspanInit); } -_X_EXPORT void +void miZeroDashLine( DrawablePtr dst, GCPtr pgc, |