[Xquartz-changes] xserver: Branch 'master' - 2 commits

[Jeremy Huddleston]

 dix/events.c |    2 +-
 dix/window.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a80b1f888f2f7674a715d512ab950eeadee20448
Merge: 4971099... 0efd7b8...
Author: Keith Packard <keithp at keithp.com>
Date:   Sun May 2 16:35:17 2010 -0700

    Merge remote branch 'jeremyhu/master'

commit 4971099860e8e6d7817ada92e2636cb435fd002d
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Sun May 2 19:14:39 2010 +0300

    dix: wrap variables with #ifdef when panoramix is not used
    
    this shut up some warnings.
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
    Reviewed-by: Jamey Sharp <jamey at minilop.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

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)