From 1b0fcca503ae9cf2d462b60770f96c794dfbb27a Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 15 Jan 2014 21:23:25 +0100 Subject: mesa xkeyboard-config xserver git update 15 jan 2014 xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43 --- xorg-server/exa/exa_glyphs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xorg-server/exa/exa_glyphs.c') diff --git a/xorg-server/exa/exa_glyphs.c b/xorg-server/exa/exa_glyphs.c index 71f750fb6..aa71b215e 100644 --- a/xorg-server/exa/exa_glyphs.c +++ b/xorg-server/exa/exa_glyphs.c @@ -127,7 +127,7 @@ exaUnrealizeGlyphCaches(ScreenPtr pScreen, unsigned int format) continue; if (cache->picture) { - FreePicture((pointer) cache->picture, (XID) 0); + FreePicture((void *) cache->picture, (XID) 0); cache->picture = NULL; } @@ -225,7 +225,7 @@ exaRealizeGlyphCaches(ScreenPtr pScreen, unsigned int format) } /* Each cache references the picture individually */ - FreePicture((pointer) pPicture, (XID) 0); + FreePicture((void *) pPicture, (XID) 0); return TRUE; bail: @@ -737,7 +737,7 @@ exaGlyphs(CARD8 op, /* The driver can't seem to composite to a8, let's try argb (but * without component-alpha) */ - FreePicture((pointer) pMask, (XID) 0); + FreePicture((void *) pMask, (XID) 0); argbFormat = PictureMatchFormat(pScreen, 32, PICT_a8r8g8b8); @@ -833,7 +833,7 @@ exaGlyphs(CARD8 op, pDst, xSrc + x - first_xOff, ySrc + y - first_yOff, 0, 0, x, y, width, height); - FreePicture((pointer) pMask, (XID) 0); + FreePicture((void *) pMask, (XID) 0); (*pScreen->DestroyPixmap) (pMaskPixmap); } } -- cgit v1.2.3