frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark everything in misym.c as _X_EXPORT.

This commit is contained in:
Adam Jackson 2006-02-15 19:05:55 +00:00
parent 6ad4325b87
commit 3fe482c77e
36 changed files with 170 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ChangeLog
View File

@ -1,3 +1,41 @@
2006-02-15 Adam Jackson <ajax@freedesktop.org>
* mi/miarc.c:
* mi/mibank.c:
* mi/mibitblt.c:
* mi/mibstore.c:
* mi/micmap.c:
* mi/micursor.c:
* mi/midash.c:
* mi/midispcur.c:
* mi/miexpose.c:
* mi/mifillarc.c:
* mi/mifillrct.c:
* mi/migc.c:
* mi/miglblt.c:
* mi/miinitext.c:
* mi/mioverlay.c:
* mi/mipointer.c:
* mi/mipoly.c:
* mi/mipolycon.c:
* mi/mipolypnt.c:
* mi/mipolyrect.c:
* mi/mipolyseg.c:
* mi/mipolytext.c:
* mi/mipushpxl.c:
* mi/miregion.c:
* mi/miscrinit.c:
* mi/misprite.c:
* mi/mivaltree.c:
* mi/miwideline.c:
* mi/miwindow.c:
* mi/mizerarc.c:
* mi/mizerclip.c:
* mi/mizerline.c:
* miext/cw/cw.c:
* miext/damage/damage.c:
* render/miglyph.c:
Mark everything in misym.c as _X_EXPORT.
2006-02-15 Kristian Høgsberg <krh@redhat.com> 2006-02-15 Kristian Høgsberg <krh@redhat.com>
* GL/symlink-mesa.sh: * GL/symlink-mesa.sh:

4
mi/miarc.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 1.3 2005/04/20 12:25:45 daniels Exp $ */ /* $XdotOrg: xserver/xorg/mi/miarc.c,v 1.6 2005/07/03 08:53:51 daniels Exp $ */
/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */
/*********************************************************** /***********************************************************
@ -1073,7 +1073,7 @@ miFillWideEllipse(
* fuller explanation of this.) * fuller explanation of this.)
*/ */
void _X_EXPORT void
miPolyArc(pDraw, pGC, narcs, parcs) miPolyArc(pDraw, pGC, narcs, parcs)
DrawablePtr pDraw; DrawablePtr pDraw;
GCPtr pGC; GCPtr pGC;

4
mi/mibank.c
View File

@ -2166,7 +2166,7 @@ miBankRestoreAreas(
SCREEN_RESTORE; SCREEN_RESTORE;
} }
Bool _X_EXPORT Bool
miInitializeBanking( miInitializeBanking(
ScreenPtr pScreen, ScreenPtr pScreen,
unsigned int xsize, unsigned int xsize,
@ -2413,7 +2413,7 @@ miBankNewSerialNumber(
} }
/* This entry modifies the banking interface */ /* This entry modifies the banking interface */
Bool _X_EXPORT Bool
miModifyBanking( miModifyBanking(
ScreenPtr pScreen, ScreenPtr pScreen,
miBankInfoPtr pBankInfo miBankInfoPtr pBankInfo

8
mi/mibitblt.c
View File

@ -75,7 +75,7 @@ extern int ffs(int);
* set them in the destination with SetSpans * set them in the destination with SetSpans
* We let SetSpans worry about clipping to the destination. * We let SetSpans worry about clipping to the destination.
*/ */
RegionPtr _X_EXPORT RegionPtr
miCopyArea(pSrcDrawable, pDstDrawable, miCopyArea(pSrcDrawable, pDstDrawable,
pGC, xIn, yIn, widthSrc, heightSrc, xOut, yOut) pGC, xIn, yIn, widthSrc, heightSrc, xOut, yOut)
register DrawablePtr pSrcDrawable; register DrawablePtr pSrcDrawable;
@ -553,7 +553,7 @@ miOpqStipDrawable(pDraw, pGC, prgnSrc, pbits, srcx, w, h, dstx, dsty)
* build a source clip * build a source clip
* Use the bitmap we've built up as a Stipple for the destination * Use the bitmap we've built up as a Stipple for the destination
*/ */
RegionPtr _X_EXPORT RegionPtr
miCopyPlane(pSrcDrawable, pDstDrawable, miCopyPlane(pSrcDrawable, pDstDrawable,
pGC, srcx, srcy, width, height, dstx, dsty, bitPlane) pGC, srcx, srcy, width, height, dstx, dsty, bitPlane)
DrawablePtr pSrcDrawable; DrawablePtr pSrcDrawable;
@ -647,7 +647,7 @@ miCopyPlane(pSrcDrawable, pDstDrawable,
* XY format: * XY format:
* get the single plane specified in planemask * get the single plane specified in planemask
*/ */
void _X_EXPORT void
miGetImage(pDraw, sx, sy, w, h, format, planeMask, pDst) miGetImage(pDraw, sx, sy, w, h, format, planeMask, pDst)
DrawablePtr pDraw; DrawablePtr pDraw;
int sx, sy, w, h; int sx, sy, w, h;
@ -748,7 +748,7 @@ miGetImage(pDraw, sx, sy, w, h, format, planeMask, pDst)
* ZPixmap format: * ZPixmap format:
* This part is simple, just call SetSpans * This part is simple, just call SetSpans
*/ */
void _X_EXPORT void
miPutImage(pDraw, pGC, depth, x, y, w, h, leftPad, format, pImage) miPutImage(pDraw, pGC, depth, x, y, w, h, leftPad, format, pImage)
DrawablePtr pDraw; DrawablePtr pDraw;
GCPtr pGC; GCPtr pGC;

2
mi/mibstore.c
View File

@ -357,7 +357,7 @@ static GCFuncs miBSCheapGCFuncs = {
* must be previously initialized. * must be previously initialized.
*/ */
void _X_EXPORT void
miInitializeBackingStore (pScreen) miInitializeBackingStore (pScreen)
ScreenPtr pScreen; ScreenPtr pScreen;
{ {

30
mi/micmap.c
View File

@ -48,15 +48,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "globals.h" #include "globals.h"
#include "micmap.h" #include "micmap.h"
ColormapPtr miInstalledMaps[MAXSCREENS]; _X_EXPORT ColormapPtr miInstalledMaps[MAXSCREENS];
static Bool miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, static Bool miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp,
int *ndepthp, int *rootDepthp, VisualID *defaultVisp, int *ndepthp, int *rootDepthp, VisualID *defaultVisp,
unsigned long sizes, int bitsPerRGB, int preferredVis); unsigned long sizes, int bitsPerRGB, int preferredVis);
miInitVisualsProcPtr miInitVisualsProc = miDoInitVisuals; _X_EXPORT miInitVisualsProcPtr miInitVisualsProc = miDoInitVisuals;
int _X_EXPORT int
miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
{ {
if (miInstalledMaps[pScreen->myNum]) { if (miInstalledMaps[pScreen->myNum]) {
@ -66,7 +66,7 @@ miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
return 0; return 0;
} }
void _X_EXPORT void
miInstallColormap(ColormapPtr pmap) miInstallColormap(ColormapPtr pmap)
{ {
int index = pmap->pScreen->myNum; int index = pmap->pScreen->myNum;
@ -85,7 +85,7 @@ miInstallColormap(ColormapPtr pmap)
} }
} }
void _X_EXPORT void
miUninstallColormap(ColormapPtr pmap) miUninstallColormap(ColormapPtr pmap)
{ {
int index = pmap->pScreen->myNum; int index = pmap->pScreen->myNum;
@ -102,7 +102,7 @@ miUninstallColormap(ColormapPtr pmap)
} }
} }
void _X_EXPORT void
miResolveColor(unsigned short *pred, unsigned short *pgreen, miResolveColor(unsigned short *pred, unsigned short *pgreen,
unsigned short *pblue, VisualPtr pVisual) unsigned short *pblue, VisualPtr pVisual)
{ {
@ -124,7 +124,7 @@ miResolveColor(unsigned short *pred, unsigned short *pgreen,
} }
} }
Bool _X_EXPORT Bool
miInitializeColormap(ColormapPtr pmap) miInitializeColormap(ColormapPtr pmap)
{ {
register unsigned i; register unsigned i;
@ -209,7 +209,7 @@ miInitializeColormap(ColormapPtr pmap)
outdefs[i].blue = pmap->blue[blue >> pVisual->offsetBlue].co.local.blue; \ outdefs[i].blue = pmap->blue[blue >> pVisual->offsetBlue].co.local.blue; \
} }
int _X_EXPORT int
miExpandDirectColors(ColormapPtr pmap, int ndef, xColorItem *indefs, miExpandDirectColors(ColormapPtr pmap, int ndef, xColorItem *indefs,
xColorItem *outdefs) xColorItem *outdefs)
{ {
@ -269,7 +269,7 @@ miExpandDirectColors(ColormapPtr pmap, int ndef, xColorItem *indefs,
return nresult; return nresult;
} }
Bool _X_EXPORT Bool
miCreateDefColormap(ScreenPtr pScreen) miCreateDefColormap(ScreenPtr pScreen)
{ {
/* /*
@ -386,7 +386,7 @@ static int miVisualPriority[] = {
static miVisualsPtr miVisuals; static miVisualsPtr miVisuals;
void _X_EXPORT void
miClearVisualTypes() miClearVisualTypes()
{ {
miVisualsPtr v; miVisualsPtr v;
@ -398,7 +398,7 @@ miClearVisualTypes()
} }
Bool _X_EXPORT Bool
miSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB, miSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB,
int preferredCVC, int preferredCVC,
Pixel redMask, Pixel greenMask, Pixel blueMask) Pixel redMask, Pixel greenMask, Pixel blueMask)
@ -432,14 +432,14 @@ miSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB,
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
miSetVisualTypes(int depth, int visuals, int bitsPerRGB, int preferredCVC) miSetVisualTypes(int depth, int visuals, int bitsPerRGB, int preferredCVC)
{ {
return miSetVisualTypesAndMasks (depth, visuals, bitsPerRGB, return miSetVisualTypesAndMasks (depth, visuals, bitsPerRGB,
preferredCVC, 0, 0, 0); preferredCVC, 0, 0, 0);
} }
int _X_EXPORT int
miGetDefaultVisualMask(int depth) miGetDefaultVisualMask(int depth)
{ {
if (depth > MAX_PSEUDO_DEPTH) if (depth > MAX_PSEUDO_DEPTH)
@ -463,7 +463,7 @@ miVisualTypesSet (int depth)
return FALSE; return FALSE;
} }
Bool _X_EXPORT Bool
miSetPixmapDepths (void) miSetPixmapDepths (void)
{ {
int d, f; int d, f;
@ -481,7 +481,7 @@ miSetPixmapDepths (void)
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
miInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, miInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp,
int *ndepthp, int *rootDepthp, VisualID *defaultVisp, int *ndepthp, int *rootDepthp, VisualID *defaultVisp,
unsigned long sizes, int bitsPerRGB, int preferredVis) unsigned long sizes, int bitsPerRGB, int preferredVis)

2
mi/micursor.c
View File

@ -57,7 +57,7 @@ SOFTWARE.
extern Bool Must_have_memory; extern Bool Must_have_memory;
void _X_EXPORT void
miRecolorCursor( pScr, pCurs, displayed) miRecolorCursor( pScr, pCurs, displayed)
ScreenPtr pScr; ScreenPtr pScr;
CursorPtr pCurs; CursorPtr pCurs;

2
mi/midash.c
View File

@ -277,7 +277,7 @@ CheckDashStorage(
return(*ppseg+(nseg-1)); return(*ppseg+(nseg-1));
} }
void _X_EXPORT void
miStepDash (dist, pDashIndex, pDash, numInDashList, pDashOffset) miStepDash (dist, pDashIndex, pDash, numInDashList, pDashOffset)
int dist; /* distance to step */ int dist; /* distance to step */
int *pDashIndex; /* current dash */ int *pDashIndex; /* current dash */

2
mi/midispcur.c
View File

@ -112,7 +112,7 @@ static miSpriteCursorFuncRec miDCFuncs = {
miDCChangeSave, miDCChangeSave,
}; };
Bool _X_EXPORT Bool
miDCInitialize (pScreen, screenFuncs) miDCInitialize (pScreen, screenFuncs)
ScreenPtr pScreen; ScreenPtr pScreen;
miPointerScreenFuncPtr screenFuncs; miPointerScreenFuncPtr screenFuncs;

12
mi/miexpose.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.3 2005/04/20 12:25:45 daniels Exp $ */ /* $XdotOrg: xserver/xorg/mi/miexpose.c,v 1.6 2005/07/03 08:53:51 daniels Exp $ */
/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.9tsi Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.9tsi Exp $ */
/*********************************************************** /***********************************************************
@ -130,7 +130,7 @@ exposing is done by the backing store's GraphicsExpose function, of course.
*/ */
RegionPtr _X_EXPORT RegionPtr
miHandleExposures(pSrcDrawable, pDstDrawable, miHandleExposures(pSrcDrawable, pDstDrawable,
pGC, srcx, srcy, width, height, dstx, dsty, plane) pGC, srcx, srcy, width, height, dstx, dsty, plane)
register DrawablePtr pSrcDrawable; register DrawablePtr pSrcDrawable;
@ -379,7 +379,7 @@ miHandleExposures(pSrcDrawable, pDstDrawable,
/* send GraphicsExpose events, or a NoExpose event, based on the region */ /* send GraphicsExpose events, or a NoExpose event, based on the region */
void _X_EXPORT void
miSendGraphicsExpose (client, pRgn, drawable, major, minor) miSendGraphicsExpose (client, pRgn, drawable, major, minor)
ClientPtr client; ClientPtr client;
RegionPtr pRgn; RegionPtr pRgn;
@ -493,7 +493,7 @@ miSendExposures(pWin, pRgn, dx, dy)
DEALLOCATE_LOCAL(pEvent); DEALLOCATE_LOCAL(pEvent);
} }
void _X_EXPORT void
miWindowExposures(pWin, prgn, other_exposed) miWindowExposures(pWin, prgn, other_exposed)
WindowPtr pWin; WindowPtr pWin;
register RegionPtr prgn, other_exposed; register RegionPtr prgn, other_exposed;
@ -630,7 +630,7 @@ tossGC (
} }
void _X_EXPORT void
miPaintWindow(pWin, prgn, what) miPaintWindow(pWin, prgn, what)
register WindowPtr pWin; register WindowPtr pWin;
RegionPtr prgn; RegionPtr prgn;
@ -884,7 +884,7 @@ int what;
/* MICLEARDRAWABLE -- sets the entire drawable to the background color of /* MICLEARDRAWABLE -- sets the entire drawable to the background color of
* the GC. Useful when we have a scratch drawable and need to initialize * the GC. Useful when we have a scratch drawable and need to initialize
* it. */ * it. */
void _X_EXPORT void
miClearDrawable(pDraw, pGC) miClearDrawable(pDraw, pGC)
DrawablePtr pDraw; DrawablePtr pDraw;
GCPtr pGC; GCPtr pGC;

6
mi/mifillarc.c
View File

@ -54,7 +54,7 @@ Author: Bob Scheifler, MIT X Consortium
#define Dsin(d) sin((double)d*(M_PI/11520.0)) #define Dsin(d) sin((double)d*(M_PI/11520.0))
#define Dcos(d) cos((double)d*(M_PI/11520.0)) #define Dcos(d) cos((double)d*(M_PI/11520.0))
void _X_EXPORT void
miFillArcSetup(arc, info) miFillArcSetup(arc, info)
register xArc *arc; register xArc *arc;
register miFillArcRec *info; register miFillArcRec *info;
@ -316,7 +316,7 @@ miGetPieEdge(
miGetArcEdge(arc, edge, k, top, left); miGetArcEdge(arc, edge, k, top, left);
} }
void _X_EXPORT void
miFillArcSliceSetup(arc, slice, pGC) miFillArcSliceSetup(arc, slice, pGC)
register xArc *arc; register xArc *arc;
register miArcSliceRec *slice; register miArcSliceRec *slice;
@ -785,7 +785,7 @@ miFillArcSliceD(
* Since we don't have to worry about overlapping segments, we can just * Since we don't have to worry about overlapping segments, we can just
* fill each arc as it comes. * fill each arc as it comes.
*/ */
void _X_EXPORT void
miPolyFillArc(pDraw, pGC, narcs, parcs) miPolyFillArc(pDraw, pGC, narcs, parcs)
DrawablePtr pDraw; DrawablePtr pDraw;
GCPtr pGC; GCPtr pGC;

2
mi/mifillrct.c
View File

@ -68,7 +68,7 @@ SOFTWARE.
* then call FillSpans to fill each rectangle. We let FillSpans worry about * then call FillSpans to fill each rectangle. We let FillSpans worry about
* clipping to the destination * clipping to the destination
*/ */
void _X_EXPORT void
miPolyFillRect(pDrawable, pGC, nrectFill, prectInit) miPolyFillRect(pDrawable, pGC, nrectFill, prectInit)
DrawablePtr pDrawable; DrawablePtr pDrawable;
GCPtr pGC; GCPtr pGC;

18
mi/migc.c
View File

@ -40,7 +40,7 @@ from The Open Group.
#include "migc.h" #include "migc.h"
/* ARGSUSED */ /* ARGSUSED */
void _X_EXPORT void
miChangeGC(pGC, mask) miChangeGC(pGC, mask)
GCPtr pGC; GCPtr pGC;
unsigned long mask; unsigned long mask;
@ -48,7 +48,7 @@ miChangeGC(pGC, mask)
return; return;
} }
void _X_EXPORT void
miDestroyGC(pGC) miDestroyGC(pGC)
GCPtr pGC; GCPtr pGC;
{ {
@ -63,7 +63,7 @@ miDestroyGC(pGC)
* create a private op array for a gc * create a private op array for a gc
*/ */
GCOpsPtr _X_EXPORT GCOpsPtr
miCreateGCOps(prototype) miCreateGCOps(prototype)
GCOpsPtr prototype; GCOpsPtr prototype;
{ {
@ -79,7 +79,7 @@ miCreateGCOps(prototype)
return ret; return ret;
} }
void _X_EXPORT void
miDestroyGCOps(ops) miDestroyGCOps(ops)
GCOpsPtr ops; GCOpsPtr ops;
{ {
@ -88,7 +88,7 @@ miDestroyGCOps(ops)
} }
void _X_EXPORT void
miDestroyClip(pGC) miDestroyClip(pGC)
GCPtr pGC; GCPtr pGC;
{ {
@ -110,7 +110,7 @@ miDestroyClip(pGC)
pGC->clientClipType = CT_NONE; pGC->clientClipType = CT_NONE;
} }
void _X_EXPORT void
miChangeClip(pGC, type, pvalue, nrects) miChangeClip(pGC, type, pvalue, nrects)
GCPtr pGC; GCPtr pGC;
int type; int type;
@ -141,7 +141,7 @@ miChangeClip(pGC, type, pvalue, nrects)
pGC->stateChanges |= GCClipMask; pGC->stateChanges |= GCClipMask;
} }
void _X_EXPORT void
miCopyClip(pgcDst, pgcSrc) miCopyClip(pgcDst, pgcSrc)
GCPtr pgcDst, pgcSrc; GCPtr pgcDst, pgcSrc;
{ {
@ -166,7 +166,7 @@ miCopyClip(pgcDst, pgcSrc)
} }
/* ARGSUSED */ /* ARGSUSED */
void _X_EXPORT void
miCopyGC(pGCSrc, changes, pGCDst) miCopyGC(pGCSrc, changes, pGCDst)
GCPtr pGCSrc; GCPtr pGCSrc;
unsigned long changes; unsigned long changes;
@ -175,7 +175,7 @@ miCopyGC(pGCSrc, changes, pGCDst)
return; return;
} }
void _X_EXPORT void
miComputeCompositeClip(pGC, pDrawable) miComputeCompositeClip(pGC, pDrawable)
GCPtr pGC; GCPtr pGC;
DrawablePtr pDrawable; DrawablePtr pDrawable;

4
mi/miglblt.c
View File

@ -83,7 +83,7 @@ with the sample server.
use the bitmap in a call to PushPixels use the bitmap in a call to PushPixels
*/ */
void _X_EXPORT void
miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
DrawablePtr pDrawable; DrawablePtr pDrawable;
GC *pGC; GC *pGC;
@ -196,7 +196,7 @@ miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
} }
void _X_EXPORT void
miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
DrawablePtr pDrawable; DrawablePtr pDrawable;
GC *pGC; GC *pGC;

7
mi/miinitext.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.29 2006/01/06 23:06:15 ajax Exp $ */ /* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.30 2006/01/08 23:43:54 ajax Exp $ */
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
/*********************************************************** /***********************************************************
@ -790,8 +790,9 @@ InitVisualWrap()
(*__miHookInitVisualsFunction)(&miInitVisualsProc); (*__miHookInitVisualsFunction)(&miInitVisualsProc);
} }
void miHookInitVisuals(void (**old)(miInitVisualsProcPtr *), _X_EXPORT void
void (*new)(miInitVisualsProcPtr *)) miHookInitVisuals(void (**old)(miInitVisualsProcPtr *),
void (*new)(miInitVisualsProcPtr *))
{ {
if (old) if (old)
*old = __miHookInitVisualsFunction; *old = __miHookInitVisualsFunction;

14
mi/mioverlay.c
View File

@ -103,7 +103,7 @@ static void miOverlayChangeBorderWidth(WindowPtr, unsigned int);
HasBorder(w) && \ HasBorder(w) && \
(w)->backgroundState == ParentRelative) (w)->backgroundState == ParentRelative)
Bool _X_EXPORT Bool
miInitOverlay( miInitOverlay(
ScreenPtr pScreen, ScreenPtr pScreen,
miOverlayInOverlayFunc inOverlayFunc, miOverlayInOverlayFunc inOverlayFunc,
@ -1730,7 +1730,7 @@ miOverlayChangeBorderWidth(
/* We need this as an addition since the xf86 common code doesn't /* We need this as an addition since the xf86 common code doesn't
know about the second tree which is static to this file. */ know about the second tree which is static to this file. */
void _X_EXPORT void
miOverlaySetRootClip(ScreenPtr pScreen, Bool enable) miOverlaySetRootClip(ScreenPtr pScreen, Bool enable)
{ {
WindowPtr pRoot = WindowTable[pScreen->myNum]; WindowPtr pRoot = WindowTable[pScreen->myNum];
@ -1818,7 +1818,7 @@ miOverlayClearToBackground(
/****************************************************************/ /****************************************************************/
/* not used */ /* not used */
Bool _X_EXPORT Bool
miOverlayGetPrivateClips( miOverlayGetPrivateClips(
WindowPtr pWin, WindowPtr pWin,
RegionPtr *borderClip, RegionPtr *borderClip,
@ -1837,7 +1837,7 @@ miOverlayGetPrivateClips(
return FALSE; return FALSE;
} }
void _X_EXPORT void
miOverlaySetTransFunction ( miOverlaySetTransFunction (
ScreenPtr pScreen, ScreenPtr pScreen,
miOverlayTransFunc transFunc miOverlayTransFunc transFunc
@ -1845,13 +1845,13 @@ miOverlaySetTransFunction (
MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->MakeTransparent = transFunc; MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->MakeTransparent = transFunc;
} }
Bool _X_EXPORT Bool
miOverlayCopyUnderlay(ScreenPtr pScreen) miOverlayCopyUnderlay(ScreenPtr pScreen)
{ {
return MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->copyUnderlay; return MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->copyUnderlay;
} }
void _X_EXPORT void
miOverlayComputeCompositeClip(GCPtr pGC, WindowPtr pWin) miOverlayComputeCompositeClip(GCPtr pGC, WindowPtr pWin)
{ {
ScreenPtr pScreen = pGC->pScreen; ScreenPtr pScreen = pGC->pScreen;
@ -1907,7 +1907,7 @@ miOverlayComputeCompositeClip(GCPtr pGC, WindowPtr pWin)
} }
} }
Bool _X_EXPORT Bool
miOverlayCollectUnderlayRegions( miOverlayCollectUnderlayRegions(
WindowPtr pWin, WindowPtr pWin,
RegionPtr *region RegionPtr *region

16
mi/mipointer.c
View File

@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
# include "cursorstr.h" # include "cursorstr.h"
# include "dixstruct.h" # include "dixstruct.h"
int miPointerScreenIndex; _X_EXPORT int miPointerScreenIndex;
static unsigned long miPointerGeneration = 0; static unsigned long miPointerGeneration = 0;
#define GetScreenPrivate(s) ((miPointerScreenPtr) ((s)->devPrivates[miPointerScreenIndex].ptr)) #define GetScreenPrivate(s) ((miPointerScreenPtr) ((s)->devPrivates[miPointerScreenIndex].ptr))
@ -71,7 +71,7 @@ static Bool miPointerSetCursorPosition(ScreenPtr pScreen, int x, int y,
static Bool miPointerCloseScreen(int index, ScreenPtr pScreen); static Bool miPointerCloseScreen(int index, ScreenPtr pScreen);
static void miPointerMove(ScreenPtr pScreen, int x, int y, unsigned long time); static void miPointerMove(ScreenPtr pScreen, int x, int y, unsigned long time);
Bool _X_EXPORT Bool
miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate) miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate)
ScreenPtr pScreen; ScreenPtr pScreen;
miPointerSpriteFuncPtr spriteFuncs; miPointerSpriteFuncPtr spriteFuncs;
@ -233,7 +233,7 @@ miPointerSetCursorPosition(pScreen, x, y, generateEvent)
/* Once signals are ignored, the WarpCursor function can call this */ /* Once signals are ignored, the WarpCursor function can call this */
void _X_EXPORT void
miPointerWarpCursor (pScreen, x, y) miPointerWarpCursor (pScreen, x, y)
ScreenPtr pScreen; ScreenPtr pScreen;
int x, y; int x, y;
@ -268,13 +268,13 @@ miPointerWarpCursor (pScreen, x, y)
* Pointer/CursorDisplay interface routines * Pointer/CursorDisplay interface routines
*/ */
int _X_EXPORT int
miPointerGetMotionBufferSize () miPointerGetMotionBufferSize ()
{ {
return MOTION_SIZE; return MOTION_SIZE;
} }
int _X_EXPORT int
miPointerGetMotionEvents (pPtr, coords, start, stop, pScreen) miPointerGetMotionEvents (pPtr, coords, start, stop, pScreen)
DeviceIntPtr pPtr; DeviceIntPtr pPtr;
xTimecoord *coords; xTimecoord *coords;
@ -399,7 +399,7 @@ miPointerSetNewScreen(int screen_no, int x, int y)
miPointer.limits.y2 = pScreen->height; miPointer.limits.y2 = pScreen->height;
} }
ScreenPtr _X_EXPORT ScreenPtr
miPointerCurrentScreen () miPointerCurrentScreen ()
{ {
return (miPointer.pScreen); return (miPointer.pScreen);
@ -409,7 +409,7 @@ miPointerCurrentScreen ()
* miPointerAbsoluteCursor. The pointer has moved to x,y * miPointerAbsoluteCursor. The pointer has moved to x,y
*/ */
void _X_EXPORT void
miPointerAbsoluteCursor (x, y, time) miPointerAbsoluteCursor (x, y, time)
int x, y; int x, y;
unsigned long time; unsigned long time;
@ -456,7 +456,7 @@ miPointerAbsoluteCursor (x, y, time)
miPointerMove (pScreen, x, y, time); miPointerMove (pScreen, x, y, time);
} }
void _X_EXPORT void
miPointerPosition (x, y) miPointerPosition (x, y)
int *x, *y; int *x, *y;
{ {

2
mi/mipoly.c
View File

@ -68,7 +68,7 @@ SOFTWARE.
#include "regionstr.h" #include "regionstr.h"
void _X_EXPORT void
miFillPolygon(dst, pgc, shape, mode, count, pPts) miFillPolygon(dst, pgc, shape, mode, count, pPts)
DrawablePtr dst; DrawablePtr dst;
register GCPtr pgc; register GCPtr pgc;

2
mi/mipolycon.c
View File

@ -73,7 +73,7 @@ static int getPolyYBounds(DDXPointPtr pts, int n, int *by, int *ty);
* For a derivation of the algorithm, see the author of * For a derivation of the algorithm, see the author of
* this code. * this code.
*/ */
Bool _X_EXPORT Bool
miFillConvexPoly(dst, pgc, count, ptsIn) miFillConvexPoly(dst, pgc, count, ptsIn)
DrawablePtr dst; DrawablePtr dst;
GCPtr pgc; GCPtr pgc;

2
mi/mipolypnt.c
View File

@ -57,7 +57,7 @@ SOFTWARE.
#include "windowstr.h" #include "windowstr.h"
#include "mi.h" #include "mi.h"
void _X_EXPORT void
miPolyPoint(pDrawable, pGC, mode, npt, pptInit) miPolyPoint(pDrawable, pGC, mode, npt, pptInit)
DrawablePtr pDrawable; DrawablePtr pDrawable;
GCPtr pGC; GCPtr pGC;

2
mi/mipolyrect.c
View File

@ -57,7 +57,7 @@ SOFTWARE.
#include "pixmap.h" #include "pixmap.h"
#include "mi.h" #include "mi.h"
void _X_EXPORT void
miPolyRectangle(pDraw, pGC, nrects, pRects) miPolyRectangle(pDraw, pGC, nrects, pRects)
DrawablePtr pDraw; DrawablePtr pDraw;
GCPtr pGC; GCPtr pGC;

2
mi/mipolyseg.c
View File

@ -68,7 +68,7 @@ SOFTWARE.
*****************************************************************/ *****************************************************************/
void _X_EXPORT void
miPolySegment(pDraw, pGC, nseg, pSegs) miPolySegment(pDraw, pGC, nseg, pSegs)
DrawablePtr pDraw; DrawablePtr pDraw;
GCPtr pGC; GCPtr pGC;

8
mi/mipolytext.c
View File

@ -92,7 +92,7 @@ miPolyText(pDraw, pGC, x, y, count, chars, fontEncoding)
} }
int _X_EXPORT int
miPolyText8(pDraw, pGC, x, y, count, chars) miPolyText8(pDraw, pGC, x, y, count, chars)
DrawablePtr pDraw; DrawablePtr pDraw;
GCPtr pGC; GCPtr pGC;
@ -115,7 +115,7 @@ miPolyText8(pDraw, pGC, x, y, count, chars)
} }
int _X_EXPORT int
miPolyText16(pDraw, pGC, x, y, count, chars) miPolyText16(pDraw, pGC, x, y, count, chars)
DrawablePtr pDraw; DrawablePtr pDraw;
GCPtr pGC; GCPtr pGC;
@ -163,7 +163,7 @@ miImageText(pDraw, pGC, x, y, count, chars, fontEncoding)
} }
void _X_EXPORT void
miImageText8(pDraw, pGC, x, y, count, chars) miImageText8(pDraw, pGC, x, y, count, chars)
DrawablePtr pDraw; DrawablePtr pDraw;
GCPtr pGC; GCPtr pGC;
@ -182,7 +182,7 @@ miImageText8(pDraw, pGC, x, y, count, chars)
} }
void _X_EXPORT void
miImageText16(pDraw, pGC, x, y, count, chars) miImageText16(pDraw, pGC, x, y, count, chars)
DrawablePtr pDraw; DrawablePtr pDraw;
GCPtr pGC; GCPtr pGC;

2
mi/mipushpxl.c
View File

@ -79,7 +79,7 @@ bitsizeof(int) padding and sacnline unit == bitsizeof(int).)
* in order to have both (MSB_FIRST and LSB_FIRST) versions of this * in order to have both (MSB_FIRST and LSB_FIRST) versions of this
* in the server, we need to rename one of them * in the server, we need to rename one of them
*/ */
void _X_EXPORT void
miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg)
GCPtr pGC; GCPtr pGC;
PixmapPtr pBitMap; PixmapPtr pBitMap;

50
mi/miregion.c
View File

@ -219,8 +219,8 @@ if (((numRects) < ((reg)->data->size >> 1)) && ((reg)->data->size > 50)) \
} }
BoxRec miEmptyBox = {0, 0, 0, 0}; _X_EXPORT BoxRec miEmptyBox = {0, 0, 0, 0};
RegDataRec miEmptyData = {0, 0}; _X_EXPORT RegDataRec miEmptyData = {0, 0};
RegDataRec miBrokenData = {0, 0}; RegDataRec miBrokenData = {0, 0};
RegionRec miBrokenRegion = { { 0, 0, 0, 0 }, &miBrokenData }; RegionRec miBrokenRegion = { { 0, 0, 0, 0 }, &miBrokenData };
@ -248,7 +248,7 @@ miPrintRegion(rgn)
} }
#endif /* DEBUG */ #endif /* DEBUG */
Bool _X_EXPORT Bool
miRegionEqual(reg1, reg2) miRegionEqual(reg1, reg2)
RegionPtr reg1; RegionPtr reg1;
RegionPtr reg2; RegionPtr reg2;
@ -331,7 +331,7 @@ miValidRegion(reg)
* REGION of "size" number of rectangles. * REGION of "size" number of rectangles.
*****************************************************************/ *****************************************************************/
RegionPtr _X_EXPORT RegionPtr
miRegionCreate(rect, size) miRegionCreate(rect, size)
BoxPtr rect; BoxPtr rect;
int size; int size;
@ -365,7 +365,7 @@ miRegionCreate(rect, size)
* Outer region rect is statically allocated. * Outer region rect is statically allocated.
*****************************************************************/ *****************************************************************/
void _X_EXPORT void
miRegionInit(pReg, rect, size) miRegionInit(pReg, rect, size)
RegionPtr pReg; RegionPtr pReg;
BoxPtr rect; BoxPtr rect;
@ -389,7 +389,7 @@ miRegionInit(pReg, rect, size)
} }
} }
void _X_EXPORT void
miRegionDestroy(pReg) miRegionDestroy(pReg)
RegionPtr pReg; RegionPtr pReg;
{ {
@ -399,7 +399,7 @@ miRegionDestroy(pReg)
xfree(pReg); xfree(pReg);
} }
void _X_EXPORT void
miRegionUninit(pReg) miRegionUninit(pReg)
RegionPtr pReg; RegionPtr pReg;
{ {
@ -417,7 +417,7 @@ miRegionBreak (pReg)
return FALSE; return FALSE;
} }
Bool _X_EXPORT Bool
miRectAlloc( miRectAlloc(
register RegionPtr pRgn, register RegionPtr pRgn,
int n) int n)
@ -458,7 +458,7 @@ miRectAlloc(
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
miRegionCopy(dst, src) miRegionCopy(dst, src)
register RegionPtr dst; register RegionPtr dst;
register RegionPtr src; register RegionPtr src;
@ -1025,7 +1025,7 @@ miIntersectO (
} }
Bool _X_EXPORT Bool
miIntersect(newReg, reg1, reg2) miIntersect(newReg, reg1, reg2)
register RegionPtr newReg; /* destination Region */ register RegionPtr newReg; /* destination Region */
register RegionPtr reg1; register RegionPtr reg1;
@ -1180,7 +1180,7 @@ miUnionO (
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
miUnion(newReg, reg1, reg2) miUnion(newReg, reg1, reg2)
RegionPtr newReg; /* destination Region */ RegionPtr newReg; /* destination Region */
register RegionPtr reg1; register RegionPtr reg1;
@ -1279,7 +1279,7 @@ miUnion(newReg, reg1, reg2)
* dstrgn is modified if rgn has rectangles. * dstrgn is modified if rgn has rectangles.
* *
*/ */
Bool _X_EXPORT Bool
miRegionAppend(dstrgn, rgn) miRegionAppend(dstrgn, rgn)
register RegionPtr dstrgn; register RegionPtr dstrgn;
register RegionPtr rgn; register RegionPtr rgn;
@ -1465,7 +1465,7 @@ QuickSortRects(
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
Bool _X_EXPORT Bool
miRegionValidate(badreg, pOverlap) miRegionValidate(badreg, pOverlap)
RegionPtr badreg; RegionPtr badreg;
Bool *pOverlap; Bool *pOverlap;
@ -1656,7 +1656,7 @@ bail:
return miRegionBreak (badreg); return miRegionBreak (badreg);
} }
RegionPtr _X_EXPORT RegionPtr
miRectsToRegion(nrects, prect, ctype) miRectsToRegion(nrects, prect, ctype)
int nrects; int nrects;
register xRectangle *prect; register xRectangle *prect;
@ -1881,7 +1881,7 @@ miSubtractO (
* *
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
Bool _X_EXPORT Bool
miSubtract(regD, regM, regS) miSubtract(regD, regM, regS)
register RegionPtr regD; register RegionPtr regD;
register RegionPtr regM; register RegionPtr regM;
@ -1946,7 +1946,7 @@ miSubtract(regD, regM, regS)
* *
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
Bool _X_EXPORT Bool
miInverse(newReg, reg1, invRect) miInverse(newReg, reg1, invRect)
RegionPtr newReg; /* Destination region */ RegionPtr newReg; /* Destination region */
RegionPtr reg1; /* Region to invert */ RegionPtr reg1; /* Region to invert */
@ -2006,7 +2006,7 @@ miInverse(newReg, reg1, invRect)
* that doesn't overlap the box at all and partIn is false) * that doesn't overlap the box at all and partIn is false)
*/ */
int _X_EXPORT int
miRectIn(region, prect) miRectIn(region, prect)
register RegionPtr region; register RegionPtr region;
register BoxPtr prect; register BoxPtr prect;
@ -2102,7 +2102,7 @@ miRectIn(region, prect)
translates in place translates in place
*/ */
void _X_EXPORT void
miTranslateRegion(pReg, x, y) miTranslateRegion(pReg, x, y)
register RegionPtr pReg; register RegionPtr pReg;
register int x; register int x;
@ -2216,7 +2216,7 @@ miRegionDataCopy(
return TRUE; return TRUE;
} }
void _X_EXPORT void
miRegionReset(pReg, pBox) miRegionReset(pReg, pBox)
RegionPtr pReg; RegionPtr pReg;
BoxPtr pBox; BoxPtr pBox;
@ -2229,7 +2229,7 @@ miRegionReset(pReg, pBox)
pReg->data = (RegDataPtr)NULL; pReg->data = (RegDataPtr)NULL;
} }
Bool _X_EXPORT Bool
miPointInRegion(pReg, x, y, box) miPointInRegion(pReg, x, y, box)
register RegionPtr pReg; register RegionPtr pReg;
register int x, y; register int x, y;
@ -2263,7 +2263,7 @@ miPointInRegion(pReg, x, y, box)
return(FALSE); return(FALSE);
} }
Bool _X_EXPORT Bool
miRegionNotEmpty(pReg) miRegionNotEmpty(pReg)
RegionPtr pReg; RegionPtr pReg;
{ {
@ -2278,7 +2278,7 @@ miRegionBroken(RegionPtr pReg)
return (REGION_NAR(pReg)); return (REGION_NAR(pReg));
} }
void _X_EXPORT void
miRegionEmpty(pReg) miRegionEmpty(pReg)
RegionPtr pReg; RegionPtr pReg;
{ {
@ -2289,7 +2289,7 @@ miRegionEmpty(pReg)
pReg->data = &miEmptyData; pReg->data = &miEmptyData;
} }
BoxPtr _X_EXPORT BoxPtr
miRegionExtents(pReg) miRegionExtents(pReg)
RegionPtr pReg; RegionPtr pReg;
{ {
@ -2415,7 +2415,7 @@ static void QuickSortSpans(
returns the number of new, clipped scanlines. returns the number of new, clipped scanlines.
*/ */
int _X_EXPORT int
miClipSpans( miClipSpans(
RegionPtr prgnDst, RegionPtr prgnDst,
register DDXPointPtr ppt, register DDXPointPtr ppt,
@ -2532,7 +2532,7 @@ miClipSpans(
} }
/* find the band in a region with the most rectangles */ /* find the band in a region with the most rectangles */
int _X_EXPORT int
miFindMaxBand(prgn) miFindMaxBand(prgn)
RegionPtr prgn; RegionPtr prgn;
{ {

16
mi/miscrinit.c
View File

@ -62,7 +62,7 @@ typedef struct
/* this plugs into pScreen->ModifyPixmapHeader */ /* this plugs into pScreen->ModifyPixmapHeader */
Bool _X_EXPORT Bool
miModifyPixmapHeader(pPixmap, width, height, depth, bitsPerPixel, devKind, miModifyPixmapHeader(pPixmap, width, height, depth, bitsPerPixel, devKind,
pPixData) pPixData)
PixmapPtr pPixmap; PixmapPtr pPixmap;
@ -145,7 +145,7 @@ miCloseScreen (iScreen, pScreen)
* possible private-requesting modules have been inited; we create the * possible private-requesting modules have been inited; we create the
* screen pixmap here. * screen pixmap here.
*/ */
Bool _X_EXPORT Bool
miCreateScreenResources(pScreen) miCreateScreenResources(pScreen)
ScreenPtr pScreen; ScreenPtr pScreen;
{ {
@ -206,7 +206,7 @@ miScreenDevPrivateInit(pScreen, width, pbits)
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width, miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
rootDepth, numDepths, depths, rootVisual, numVisuals, visuals) rootDepth, numDepths, depths, rootVisual, numVisuals, visuals)
register ScreenPtr pScreen; register ScreenPtr pScreen;
@ -325,7 +325,7 @@ miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
return miScreenDevPrivateInit(pScreen, width, pbits); return miScreenDevPrivateInit(pScreen, width, pbits);
} }
int _X_EXPORT int
miAllocateGCPrivateIndex() miAllocateGCPrivateIndex()
{ {
static int privateIndex = -1; static int privateIndex = -1;
@ -339,10 +339,10 @@ miAllocateGCPrivateIndex()
return privateIndex; return privateIndex;
} }
int miZeroLineScreenIndex; _X_EXPORT int miZeroLineScreenIndex;
unsigned int miZeroLineGeneration = 0; unsigned int miZeroLineGeneration = 0;
void _X_EXPORT void
miSetZeroLineBias(pScreen, bias) miSetZeroLineBias(pScreen, bias)
ScreenPtr pScreen; ScreenPtr pScreen;
unsigned int bias; unsigned int bias;
@ -356,14 +356,14 @@ miSetZeroLineBias(pScreen, bias)
pScreen->devPrivates[miZeroLineScreenIndex].uval = bias; pScreen->devPrivates[miZeroLineScreenIndex].uval = bias;
} }
PixmapPtr _X_EXPORT PixmapPtr
miGetScreenPixmap(pScreen) miGetScreenPixmap(pScreen)
ScreenPtr pScreen; ScreenPtr pScreen;
{ {
return (PixmapPtr)(pScreen->devPrivate); return (PixmapPtr)(pScreen->devPrivate);
} }
void _X_EXPORT void
miSetScreenPixmap(pPix) miSetScreenPixmap(pPix)
PixmapPtr pPix; PixmapPtr pPix;
{ {

2
mi/misprite.c
View File

@ -113,7 +113,7 @@ static void miSpriteSetCursor(ScreenPtr pScreen, CursorPtr pCursor,
int x, int y); int x, int y);
static void miSpriteMoveCursor(ScreenPtr pScreen, int x, int y); static void miSpriteMoveCursor(ScreenPtr pScreen, int x, int y);
miPointerSpriteFuncRec miSpritePointerFuncs = { _X_EXPORT miPointerSpriteFuncRec miSpritePointerFuncs = {
miSpriteRealizeCursor, miSpriteRealizeCursor,
miSpriteUnrealizeCursor, miSpriteUnrealizeCursor,
miSpriteSetCursor, miSpriteSetCursor,

4
mi/mivaltree.c
View File

@ -1,5 +1,5 @@
/* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
/* $XdotOrg: xc/programs/Xserver/mi/mivaltree.c,v 1.4 2005/04/20 12:25:45 daniels Exp $ */ /* $XdotOrg: xserver/xorg/mi/mivaltree.c,v 1.6 2005/07/03 07:01:51 daniels Exp $ */
/* /*
* mivaltree.c -- * mivaltree.c --
* Functions for recalculating window clip lists. Main function * Functions for recalculating window clip lists. Main function
@ -110,7 +110,7 @@ Equipment Corporation.
/* /*
* Compute the visibility of a shaped window * Compute the visibility of a shaped window
*/ */
int _X_EXPORT int
miShapedWindowIn (pScreen, universe, bounding, rect, x, y) miShapedWindowIn (pScreen, universe, bounding, rect, x, y)
ScreenPtr pScreen; ScreenPtr pScreen;
RegionPtr universe, bounding; RegionPtr universe, bounding;

12
mi/miwideline.c
View File

@ -261,7 +261,7 @@ miFillRectPolyHelper (
} }
} }
/* static */ int _X_EXPORT /* static */ int
miPolyBuildEdge (x0, y0, k, dx, dy, xi, yi, left, edge) miPolyBuildEdge (x0, y0, k, dx, dy, xi, yi, left, edge)
double x0, y0; double x0, y0;
double k; /* x0 * dy - y0 * dx */ double k; /* x0 * dy - y0 * dx */
@ -320,7 +320,7 @@ miPolyBuildEdge (x0, y0, k, dx, dy, xi, yi, left, edge)
#define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr))) #define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr)))
/* static */ int _X_EXPORT /* static */ int
miPolyBuildPoly (vertices, slopes, count, xi, yi, left, right, pnleft, pnright, h) miPolyBuildPoly (vertices, slopes, count, xi, yi, left, right, pnleft, pnright, h)
register PolyVertexPtr vertices; register PolyVertexPtr vertices;
register PolySlopePtr slopes; register PolySlopePtr slopes;
@ -922,7 +922,7 @@ miRoundJoinFace (face, edge, leftEdge)
return y; return y;
} }
void _X_EXPORT void
miRoundJoinClip (pLeft, pRight, edge1, edge2, y1, y2, left1, left2) miRoundJoinClip (pLeft, pRight, edge1, edge2, y1, y2, left1, left2)
register LineFacePtr pLeft, pRight; register LineFacePtr pLeft, pRight;
PolyEdgePtr edge1, edge2; PolyEdgePtr edge1, edge2;
@ -947,7 +947,7 @@ miRoundJoinClip (pLeft, pRight, edge1, edge2, y1, y2, left1, left2)
*y2 = miRoundJoinFace (pRight, edge2, left2); *y2 = miRoundJoinFace (pRight, edge2, left2);
} }
int _X_EXPORT int
miRoundCapClip (face, isInt, edge, leftEdge) miRoundCapClip (face, isInt, edge, leftEdge)
register LineFacePtr face; register LineFacePtr face;
Bool isInt; Bool isInt;
@ -1548,7 +1548,7 @@ miCleanupSpanData (pDrawable, pGC, spanData)
miFreeSpanGroup (&spanData->fgGroup); miFreeSpanGroup (&spanData->fgGroup);
} }
void _X_EXPORT void
miWideLine (pDrawable, pGC, mode, npt, pPts) miWideLine (pDrawable, pGC, mode, npt, pPts)
DrawablePtr pDrawable; DrawablePtr pDrawable;
register GCPtr pGC; register GCPtr pGC;
@ -2046,7 +2046,7 @@ miWideDashSegment (
*pDashOffset = pDash[dashIndex] - dashRemain; *pDashOffset = pDash[dashIndex] - dashRemain;
} }
void _X_EXPORT void
miWideDash (pDrawable, pGC, mode, npt, pPts) miWideDash (pDrawable, pGC, mode, npt, pPts)
DrawablePtr pDrawable; DrawablePtr pDrawable;
register GCPtr pGC; register GCPtr pGC;

10
mi/miwindow.c
View File

@ -59,7 +59,7 @@ SOFTWARE.
#include "pixmapstr.h" #include "pixmapstr.h"
#include "mivalidate.h" #include "mivalidate.h"
void _X_EXPORT void
miClearToBackground(pWin, x, y, w, h, generateExposures) miClearToBackground(pWin, x, y, w, h, generateExposures)
WindowPtr pWin; WindowPtr pWin;
int x,y; int x,y;
@ -447,7 +447,7 @@ miMarkOverlappedWindows(pWin, pFirst, ppLayerWin)
* regions, translate the regions, restore any backing store, * regions, translate the regions, restore any backing store,
* and then send any regions still exposed to the client * and then send any regions still exposed to the client
*****/ *****/
void _X_EXPORT void
miHandleValidateExposures(pWin) miHandleValidateExposures(pWin)
WindowPtr pWin; WindowPtr pWin;
{ {
@ -981,7 +981,7 @@ miGetLayerWindow(pWin)
* and send appropriate exposure events * and send appropriate exposure events
*/ */
void _X_EXPORT void
miSetShape(pWin) miSetShape(pWin)
register WindowPtr pWin; register WindowPtr pWin;
{ {
@ -1081,7 +1081,7 @@ miSetShape(pWin)
/* Keeps the same inside(!) origin */ /* Keeps the same inside(!) origin */
void _X_EXPORT void
miChangeBorderWidth(pWin, width) miChangeBorderWidth(pWin, width)
register WindowPtr pWin; register WindowPtr pWin;
unsigned int width; unsigned int width;
@ -1165,7 +1165,7 @@ miMarkUnrealizedWindow(pChild, pWin, fromConfigure)
} }
} }
void _X_EXPORT void
miSegregateChildren(WindowPtr pWin, RegionPtr pReg, int depth) miSegregateChildren(WindowPtr pWin, RegionPtr pReg, int depth)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;

4
mi/mizerarc.c
View File

@ -97,7 +97,7 @@ static miZeroArcPtRec oob = {65536, 65536, 0};
* *
*/ */
Bool _X_EXPORT Bool
miZeroArcSetup(arc, info, ok360) miZeroArcSetup(arc, info, ok360)
register xArc *arc; register xArc *arc;
register miZeroArcRec *info; register miZeroArcRec *info;
@ -709,7 +709,7 @@ miZeroArcDashPts(
dinfo->dashOffset = pGC->dash[dinfo->dashIndex] - dashRemaining; dinfo->dashOffset = pGC->dash[dinfo->dashIndex] - dashRemaining;
} }
void _X_EXPORT void
miZeroPolyArc(pDraw, pGC, narcs, parcs) miZeroPolyArc(pDraw, pGC, narcs, parcs)
DrawablePtr pDraw; DrawablePtr pDraw;
GCPtr pGC; GCPtr pGC;

2
mi/mizerclip.c
View File

@ -405,7 +405,7 @@ the numerator is therefore (2^32 - 1), which does not overflow an unsigned
* -1 for completely clipped line * -1 for completely clipped line
* *
*/ */
int _X_EXPORT int
miZeroClipLine(xmin, ymin, xmax, ymax, miZeroClipLine(xmin, ymin, xmax, ymax,
new_x1, new_y1, new_x2, new_y2, new_x1, new_y1, new_x2, new_y2,
adx, ady, adx, ady,

4
mi/mizerline.c
View File

@ -99,7 +99,7 @@ SOFTWARE.
}\ }\
} }
void _X_EXPORT void
miZeroLine(pDraw, pGC, mode, npt, pptInit) miZeroLine(pDraw, pGC, mode, npt, pptInit)
DrawablePtr pDraw; DrawablePtr pDraw;
GCPtr pGC; GCPtr pGC;
@ -365,7 +365,7 @@ miZeroLine(pDraw, pGC, mode, npt, pptInit)
DEALLOCATE_LOCAL(pspanInit); DEALLOCATE_LOCAL(pspanInit);
} }
void _X_EXPORT void
miZeroDashLine(dst, pgc, mode, nptInit, pptInit) miZeroDashLine(dst, pgc, mode, nptInit, pptInit)
DrawablePtr dst; DrawablePtr dst;
GCPtr pgc; GCPtr pgc;

2
miext/cw/cw.c
View File

@ -666,7 +666,7 @@ miInitializeCompositeWrapper(ScreenPtr pScreen)
#endif #endif
} }
void _X_EXPORT void
miDisableCompositeWrapper(ScreenPtr pScreen) miDisableCompositeWrapper(ScreenPtr pScreen)
{ {
cwDisabled[pScreen->myNum] = TRUE; cwDisabled[pScreen->myNum] = TRUE;

2
miext/damage/damage.c
View File

@ -1960,7 +1960,7 @@ DamageRegion (DamagePtr pDamage)
return &pDamage->damage; return &pDamage->damage;
} }
void _X_EXPORT void
DamageDamageRegion (DrawablePtr pDrawable, DamageDamageRegion (DrawablePtr pDrawable,
RegionPtr pRegion) RegionPtr pRegion)
{ {

2
render/miglyph.c
View File

@ -48,7 +48,7 @@ miUnrealizeGlyph (ScreenPtr pScreen,
{ {
} }
void _X_EXPORT void
miGlyphExtents (int nlist, miGlyphExtents (int nlist,
GlyphListPtr list, GlyphListPtr list,
GlyphPtr *glyphs, GlyphPtr *glyphs,