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/hw/kdrive/ephyr/ephyr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xorg-server/hw/kdrive/ephyr/ephyr.c') diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c index b2a79855c..12c708616 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyr.c +++ b/xorg-server/hw/kdrive/ephyr/ephyr.c @@ -341,7 +341,7 @@ ephyrInternalDamageRedisplay(ScreenPtr pScreen) } static void -ephyrInternalDamageBlockHandler(pointer data, OSTimePtr pTimeout, pointer pRead) +ephyrInternalDamageBlockHandler(void *data, OSTimePtr pTimeout, void *pRead) { ScreenPtr pScreen = (ScreenPtr) data; @@ -349,7 +349,7 @@ ephyrInternalDamageBlockHandler(pointer data, OSTimePtr pTimeout, pointer pRead) } static void -ephyrInternalDamageWakeupHandler(pointer data, int i, pointer LastSelectMask) +ephyrInternalDamageWakeupHandler(void *data, int i, void *LastSelectMask) { /* FIXME: Not needed ? */ } @@ -368,7 +368,7 @@ ephyrSetInternalDamage(ScreenPtr pScreen) if (!RegisterBlockAndWakeupHandlers(ephyrInternalDamageBlockHandler, ephyrInternalDamageWakeupHandler, - (pointer) pScreen)) + (void *) pScreen)) return FALSE; pPixmap = (*pScreen->GetScreenPixmap) (pScreen); @@ -389,7 +389,7 @@ ephyrUnsetInternalDamage(ScreenPtr pScreen) RemoveBlockAndWakeupHandlers(ephyrInternalDamageBlockHandler, ephyrInternalDamageWakeupHandler, - (pointer) pScreen); + (void *) pScreen); } #ifdef RANDR -- cgit v1.2.3