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/miext/damage/damage.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/miext/damage/damage.c')
-rwxr-xr-x | nx-X11/programs/Xserver/miext/damage/damage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/miext/damage/damage.c b/nx-X11/programs/Xserver/miext/damage/damage.c index 286728cd1..c2a98d422 100755 --- a/nx-X11/programs/Xserver/miext/damage/damage.c +++ b/nx-X11/programs/Xserver/miext/damage/damage.c @@ -327,7 +327,7 @@ static void damageValidateGC(GCPtr, unsigned long, DrawablePtr); static void damageChangeGC(GCPtr, unsigned long); static void damageCopyGC(GCPtr, unsigned long, GCPtr); static void damageDestroyGC(GCPtr); -static void damageChangeClip(GCPtr, int, pointer, int); +static void damageChangeClip(GCPtr, int, void *, int); static void damageDestroyClip(GCPtr); static void damageCopyClip(GCPtr, GCPtr); @@ -440,7 +440,7 @@ damageCopyGC (GCPtr pGCSrc, static void damageChangeClip (GCPtr pGC, int type, - pointer pvalue, + void *pvalue, int nrects) { DAMAGE_GC_FUNC_PROLOGUE (pGC); @@ -1453,7 +1453,7 @@ damageImageGlyphBlt(DrawablePtr pDrawable, int y, unsigned int nglyph, CharInfoPtr *ppci, - pointer pglyphBase) + void * pglyphBase) { DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable); damageDamageChars (pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y, @@ -1470,7 +1470,7 @@ damagePolyGlyphBlt(DrawablePtr pDrawable, int y, unsigned int nglyph, CharInfoPtr *ppci, - pointer pglyphBase) + void * pglyphBase) { DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable); damageDamageChars (pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y, @@ -1801,7 +1801,7 @@ DamageSetup (ScreenPtr pScreen) } #endif - pScreen->devPrivates[damageScrPrivateIndex].ptr = (pointer) pScrPriv; + pScreen->devPrivates[damageScrPrivateIndex].ptr = (void *) pScrPriv; return TRUE; } |