[PATCH] dix: wrap variables with #ifdef when panoramix is not used

[Keith Packard]

On Fri, 30 Apr 2010 15:01:40 +0300, Tiago Vignatti <tiago.vignatti at nokia.com> wrote:
> this shut up some warnings.
> 
> Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
> ---
>  dix/events.c |    2 ++
>  dix/window.c |    2 ++
>  2 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/dix/events.c b/dix/events.c
> index b26e28a..610bccd 100644
> --- a/dix/events.c
> +++ b/dix/events.c
> @@ -2569,7 +2569,9 @@ static Bool
>  PointInBorderSize(WindowPtr pWin, int x, int y)
>  {
>      BoxRec box;
> +#ifdef PANORAMIX
>      SpritePtr pSprite = inputInfo.pointer->spriteInfo->sprite;
> +#endif
>  
>      if(POINT_IN_REGION(pWin->drawable.pScreen, &pWin->borderSize, x, y, &box))
>  	return TRUE;
> diff --git a/dix/window.c b/dix/window.c
> index c7201df..3b76cab 100644
> --- a/dix/window.c
> +++ b/dix/window.c
> @@ -2777,7 +2777,9 @@ UnrealizeTree(
>      WindowPtr pChild;
>      UnrealizeWindowProcPtr Unrealize;
>      MarkUnrealizedWindowProcPtr MarkUnrealizedWindow;
> +#ifdef PANORAMIX
>      int rc;
> +#endif

Why not just move this definition down inside the block which uses it?
There's already a PanoramiXRes *win; declaration sitting there.

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20100430/5da2b934/attachment.pgp>