xserver: Branch 'master'

[Maarten Maathuis]

 exa/exa.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1567b7243f4799808ab93fbd962df14ce3af2d49
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Sun Dec 21 00:08:56 2008 +0100

    exa: A more correct fix.

diff --git a/exa/exa.c b/exa/exa.c
index 7b732eb..d7949fd 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -72,8 +72,7 @@ exaGetPixmapOffset(PixmapPtr pPix)
 {
     ExaScreenPriv (pPix->drawable.pScreen);
 
-    return ((unsigned long)(unsigned long *)ExaGetPixmapAddress(pPix) -
-	    (unsigned long)pExaScr->info->memoryBase);
+    return (CARD8 *)ExaGetPixmapAddress(pPix) - pExaScr->info->memoryBase;
 }
 
 void *