[PATCH 2/7] fb: Make rootless-agnostic

[Aaron Plattner]

On 10/17/2013 10:30 AM, Adam Jackson wrote:
> Reviewed-by: Jasper St. Pierre <jstpierre at mecheye.net>
> Signed-off-by: Adam Jackson <ajax at redhat.com>

We just tracked down a bug to this ROOTLESS define, so
Reviewed-by: Aaron Plattner <aplattner at nvidia.com>

Karol is working on verifying that this patch fixes it, so he should be
able to provide a Tested-by line too.

-- Aaron

> ---
>  fb/fb.h | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/fb/fb.h b/fb/fb.h
> index 26957df..08d7e69 100644
> --- a/fb/fb.h
> +++ b/fb/fb.h
> @@ -642,13 +642,8 @@ typedef struct {
>  #define fbGetWindowPixmap(pWin)	((PixmapPtr)\
>  				 dixLookupPrivate(&((WindowPtr)(pWin))->devPrivates, fbGetWinPrivateKey(pWin)))
>  
> -#ifdef ROOTLESS
>  #define __fbPixDrawableX(pPix)	((pPix)->drawable.x)
>  #define __fbPixDrawableY(pPix)	((pPix)->drawable.y)
> -#else
> -#define __fbPixDrawableX(pPix)	0
> -#define __fbPixDrawableY(pPix)	0
> -#endif
>  
>  #ifdef COMPOSITE
>  #define __fbPixOffXWin(pPix)	(__fbPixDrawableX(pPix) - (pPix)->screen_x)
>