frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tiago Vignatti 2010-05-02 19:14:39 +03:00 committed by Keith Packard
parent 40858960c0
commit 4971099860
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dix/events.c
View File

@ -2558,7 +2558,6 @@ static Bool
PointInBorderSize(WindowPtr pWin, int x, int y) PointInBorderSize(WindowPtr pWin, int x, int y)
{ {
BoxRec box; BoxRec box;
SpritePtr pSprite = inputInfo.pointer->spriteInfo->sprite;
if(POINT_IN_REGION(pWin->drawable.pScreen, &pWin->borderSize, x, y, &box)) if(POINT_IN_REGION(pWin->drawable.pScreen, &pWin->borderSize, x, y, &box))
return TRUE; return TRUE;
@ -2566,6 +2565,7 @@ PointInBorderSize(WindowPtr pWin, int x, int y)
#ifdef PANORAMIX #ifdef PANORAMIX
if(!noPanoramiXExtension && if(!noPanoramiXExtension &&
XineramaSetWindowPntrs(inputInfo.pointer, pWin)) { XineramaSetWindowPntrs(inputInfo.pointer, pWin)) {
SpritePtr pSprite = inputInfo.pointer->spriteInfo->sprite;
int i; int i;
for(i = 1; i < PanoramiXNumScreens; i++) { for(i = 1; i < PanoramiXNumScreens; i++) {

3
dix/window.c
View File

@ -2777,7 +2777,6 @@ UnrealizeTree(
WindowPtr pChild; WindowPtr pChild;
UnrealizeWindowProcPtr Unrealize; UnrealizeWindowProcPtr Unrealize;
MarkUnrealizedWindowProcPtr MarkUnrealizedWindow; MarkUnrealizedWindowProcPtr MarkUnrealizedWindow;
int rc;
Unrealize = pWin->drawable.pScreen->UnrealizeWindow; Unrealize = pWin->drawable.pScreen->UnrealizeWindow;
MarkUnrealizedWindow = pWin->drawable.pScreen->MarkUnrealizedWindow; MarkUnrealizedWindow = pWin->drawable.pScreen->MarkUnrealizedWindow;
@ -2791,7 +2790,7 @@ UnrealizeTree(
#ifdef PANORAMIX #ifdef PANORAMIX
if(!noPanoramiXExtension && !pChild->drawable.pScreen->myNum) { if(!noPanoramiXExtension && !pChild->drawable.pScreen->myNum) {
PanoramiXRes *win; PanoramiXRes *win;
rc = dixLookupResourceByType((pointer *)&win, int rc = dixLookupResourceByType((pointer *)&win,
pChild->drawable.id, XRT_WINDOW, pChild->drawable.id, XRT_WINDOW,
serverClient, DixWriteAccess); serverClient, DixWriteAccess);
if (rc == Success) if (rc == Success)