summaryrefslogtreecommitdiff
path: root/xserver/mi/migc.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2014-09-27 17:53:06 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2014-09-27 17:53:06 +0000
commit4a4018aabb79405f1b50809f76e4bff4d0ead33c (patch)
treebbe31c32ce7b90f7ca8124d215cd1bc28516a259 /xserver/mi/migc.c
parent340ecc70b63a19bbc23b3ffc950d5beb49220505 (diff)
Update to xserver 1.16.1.
Tested by naddy@, jsg@ & kettenis@
Diffstat (limited to 'xserver/mi/migc.c')
-rw-r--r--xserver/mi/migc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xserver/mi/migc.c b/xserver/mi/migc.c
index c9cdd12af..9bbe8846e 100644
--- a/xserver/mi/migc.c
+++ b/xserver/mi/migc.c
@@ -72,12 +72,12 @@ miDestroyClip(GCPtr pGC)
}
void
-miChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+miChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{
(*pGC->funcs->DestroyClip) (pGC);
if (type == CT_PIXMAP) {
/* convert the pixmap to a region */
- pGC->clientClip = (pointer) BitmapToRegion(pGC->pScreen,
+ pGC->clientClip = (void *) BitmapToRegion(pGC->pScreen,
(PixmapPtr) pvalue);
(*pGC->pScreen->DestroyPixmap) (pvalue);
}
@@ -86,7 +86,7 @@ miChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
pGC->clientClip = pvalue;
}
else if (type != CT_NONE) {
- pGC->clientClip = (pointer) RegionFromRects(nrects,
+ pGC->clientClip = (void *) RegionFromRects(nrects,
(xRectangle *) pvalue,
type);
free(pvalue);
@@ -112,7 +112,7 @@ miCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
case CT_REGION:
prgnNew = RegionCreate(NULL, 1);
RegionCopy(prgnNew, (RegionPtr) (pgcSrc->clientClip));
- (*pgcDst->funcs->ChangeClip) (pgcDst, CT_REGION, (pointer) prgnNew, 0);
+ (*pgcDst->funcs->ChangeClip) (pgcDst, CT_REGION, (void *) prgnNew, 0);
break;
}
}