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

[Jamey Sharp]

Reviewed-by: Jamey Sharp <jamey at minilop.net>

On Sun, May 2, 2010 at 9:14 AM, Tiago Vignatti <tiago.vignatti at nokia.com> wrote:
> this shut up some warnings.
>
> Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
> ---
> - added keith comments.
>
>  dix/events.c |    2 +-
>  dix/window.c |    3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/dix/events.c b/dix/events.c
> index 60dd162..9dd7356 100644
> --- a/dix/events.c
> +++ b/dix/events.c
> @@ -2558,7 +2558,6 @@ static Bool
>  PointInBorderSize(WindowPtr pWin, int x, int y)
>  {
>     BoxRec box;
> -    SpritePtr pSprite = inputInfo.pointer->spriteInfo->sprite;
>
>     if(POINT_IN_REGION(pWin->drawable.pScreen, &pWin->borderSize, x, y, &box))
>        return TRUE;
> @@ -2566,6 +2565,7 @@ PointInBorderSize(WindowPtr pWin, int x, int y)
>  #ifdef PANORAMIX
>     if(!noPanoramiXExtension &&
>             XineramaSetWindowPntrs(inputInfo.pointer, pWin)) {
> +       SpritePtr pSprite = inputInfo.pointer->spriteInfo->sprite;
>        int i;
>
>        for(i = 1; i < PanoramiXNumScreens; i++) {
> diff --git a/dix/window.c b/dix/window.c
> index c7201df..02451fc 100644
> --- a/dix/window.c
> +++ b/dix/window.c
> @@ -2777,7 +2777,6 @@ UnrealizeTree(
>     WindowPtr pChild;
>     UnrealizeWindowProcPtr Unrealize;
>     MarkUnrealizedWindowProcPtr MarkUnrealizedWindow;
> -    int rc;
>
>     Unrealize = pWin->drawable.pScreen->UnrealizeWindow;
>     MarkUnrealizedWindow = pWin->drawable.pScreen->MarkUnrealizedWindow;
> @@ -2791,7 +2790,7 @@ UnrealizeTree(
>  #ifdef PANORAMIX
>            if(!noPanoramiXExtension && !pChild->drawable.pScreen->myNum) {
>                PanoramiXRes *win;
> -               rc = dixLookupResourceByType((pointer *)&win,
> +               int rc = dixLookupResourceByType((pointer *)&win,
>                                             pChild->drawable.id, XRT_WINDOW,
>                                             serverClient, DixWriteAccess);
>                if (rc == Success)
> --
> 1.6.0.4
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>