xserver: Branch 'master'

[Michel Dänzer]

On Fri, 2008-12-19 at 14:37 -0800, Maarten Maathuis wrote:
> 
> commit 2db7b66863ae6055c3ce13c88b36d620de8a4d75
> Author: Maarten Maathuis <madman2003 at gmail.com>
> Date:   Fri Dec 19 23:12:37 2008 +0100
> 
>     exa: a few cleanups
>     
>     - Some warnings silenced.
>     - Some whitespace cleanup.
> 
> diff --git a/exa/exa.c b/exa/exa.c
> index 6dfde4c..7b732eb 100644
> --- a/exa/exa.c
> +++ b/exa/exa.c
> @@ -72,7 +72,7 @@ exaGetPixmapOffset(PixmapPtr pPix)
>  {
>      ExaScreenPriv (pPix->drawable.pScreen);
>  
> -    return ((unsigned long)ExaGetPixmapAddress(pPix) -
> +    return ((unsigned long)(unsigned long *)ExaGetPixmapAddress(pPix) -
>  	    (unsigned long)pExaScr->info->memoryBase);

This looks wrong... what's the problem you're trying to solve here?


-- 
Earthling Michel Dänzer           |                http://www.vmware.com
Libre software enthusiast         |          Debian, X and DRI developer