diff options
| author | Tiago Vignatti <tiago.vignatti@nokia.com> | 2010-05-02 19:14:39 +0300 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-05-02 13:55:16 -0700 |
| commit | 4971099860e8e6d7817ada92e2636cb435fd002d (patch) | |
| tree | 9da1412c55f8d665a4ef4c0c3977cb148d0e456d | |
| parent | 40858960c02a7694b0e1b72e2a986805580ff6f1 (diff) | |
dix: wrap variables with #ifdef when panoramix is not used
this shut up some warnings.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | dix/events.c | 2 | ||||
| -rw-r--r-- | dix/window.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dix/events.c b/dix/events.c index 60dd16268..9dd735694 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 c7201df09..02451fc7e 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) |