diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
commit | edce25213ffc81389909c827c9aaac27b736b483 (patch) | |
tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/mi/migc.c | |
parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
parent | 68dd0b52e13c844d662192654fb10cb993257a59 (diff) | |
download | nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.gz nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.bz2 nx-libs-edce25213ffc81389909c827c9aaac27b736b483.zip |
Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x
Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
Diffstat (limited to 'nx-X11/programs/Xserver/mi/migc.c')
-rw-r--r-- | nx-X11/programs/Xserver/mi/migc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/mi/migc.c b/nx-X11/programs/Xserver/mi/migc.c index 0cffe98a4..2b38b257d 100644 --- a/nx-X11/programs/Xserver/mi/migc.c +++ b/nx-X11/programs/Xserver/mi/migc.c @@ -114,14 +114,14 @@ void miChangeClip(pGC, type, pvalue, nrects) GCPtr pGC; int type; - pointer pvalue; + void *pvalue; int nrects; { (*pGC->funcs->DestroyClip) (pGC); if (type == CT_PIXMAP) { /* convert the pixmap to a region */ - pGC->clientClip = (pointer) BITMAP_TO_REGION(pGC->pScreen, + pGC->clientClip = (void *) BITMAP_TO_REGION(pGC->pScreen, (PixmapPtr) pvalue); (*pGC->pScreen->DestroyPixmap) (pvalue); } @@ -132,7 +132,7 @@ miChangeClip(pGC, type, pvalue, nrects) } else if (type != CT_NONE) { - pGC->clientClip = (pointer) RECTS_TO_REGION(pGC->pScreen, nrects, + pGC->clientClip = (void *) RECTS_TO_REGION(pGC->pScreen, nrects, (xRectangle *) pvalue, type); xfree(pvalue); @@ -160,7 +160,7 @@ miCopyClip(pgcDst, pgcSrc) prgnNew = REGION_CREATE(pgcSrc->pScreen, NULL, 1); REGION_COPY(pgcDst->pScreen, prgnNew, (RegionPtr) (pgcSrc->clientClip)); - (*pgcDst->funcs->ChangeClip) (pgcDst, CT_REGION, (pointer) prgnNew, 0); + (*pgcDst->funcs->ChangeClip) (pgcDst, CT_REGION, (void *) prgnNew, 0); break; } } |