diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-15 21:23:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:23:25 +0100 |
| commit | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (patch) | |
| tree | d08c81de02b94da202195d84c99e192bc24ae69e /xorg-server/hw/xfree86/shadowfb/shadow.c | |
| parent | aaeb8bf497c82efabc4f9b27c319042c0e72d816 (diff) | |
| download | vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.gz vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.bz2 vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.zip | |
mesa xkeyboard-config xserver git update 15 jan 2014
xserver commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43
Diffstat (limited to 'xorg-server/hw/xfree86/shadowfb/shadow.c')
| -rw-r--r-- | xorg-server/hw/xfree86/shadowfb/shadow.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/hw/xfree86/shadowfb/shadow.c b/xorg-server/hw/xfree86/shadowfb/shadow.c index 614501770..43529398a 100644 --- a/xorg-server/hw/xfree86/shadowfb/shadow.c +++ b/xorg-server/hw/xfree86/shadowfb/shadow.c @@ -62,8 +62,8 @@ typedef struct { } ShadowScreenRec, *ShadowScreenPtr; typedef struct { - GCOps *ops; - GCFuncs *funcs; + const GCOps *ops; + const GCFuncs *funcs; } ShadowGCRec, *ShadowGCPtr; static DevPrivateKeyRec ShadowScreenKeyRec; @@ -96,7 +96,7 @@ static DevPrivateKeyRec ShadowGCKeyRec; #define SHADOW_GC_OP_PROLOGUE(pGC)\ ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pGC->pScreen); \ ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);\ - GCFuncs *oldFuncs = pGC->funcs;\ + const GCFuncs *oldFuncs = pGC->funcs;\ pGC->funcs = pGCPriv->funcs;\ pGC->ops = pGCPriv->ops @@ -243,7 +243,7 @@ ShadowCloseScreen(ScreenPtr pScreen) ps->Composite = pPriv->Composite; } - free((pointer) pPriv); + free((void *) pPriv); return (*pScreen->CloseScreen) (pScreen); } @@ -342,7 +342,7 @@ static void ShadowValidateGC(GCPtr, unsigned long, DrawablePtr); static void ShadowChangeGC(GCPtr, unsigned long); static void ShadowCopyGC(GCPtr, unsigned long, GCPtr); static void ShadowDestroyGC(GCPtr); -static void ShadowChangeClip(GCPtr, int, pointer, int); +static void ShadowChangeClip(GCPtr, int, void *, int); static void ShadowDestroyClip(GCPtr); static void ShadowCopyClip(GCPtr, GCPtr); @@ -409,7 +409,7 @@ ShadowCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst) } static void -ShadowChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) +ShadowChangeClip(GCPtr pGC, int type, void *pvalue, int nrects) { SHADOW_GC_FUNC_PROLOGUE(pGC); (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects); @@ -1477,7 +1477,7 @@ ShadowImageGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int x, int y, unsigned int nglyphInit, - CharInfoPtr * ppciInit, pointer pglyphBase) + CharInfoPtr * ppciInit, void *pglyphBase) { BoxRec box; Bool boxNotEmpty = FALSE; @@ -1538,7 +1538,7 @@ ShadowPolyGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int x, int y, unsigned int nglyphInit, - CharInfoPtr * ppciInit, pointer pglyphBase) + CharInfoPtr * ppciInit, void *pglyphBase) { BoxRec box; Bool boxNotEmpty = FALSE; |