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

Tiago Vignatti tiago.vignatti at nokia.com
Fri Apr 30 05:01:40 PDT 2010


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
 
     Unrealize = pWin->drawable.pScreen->UnrealizeWindow;
     MarkUnrealizedWindow = pWin->drawable.pScreen->MarkUnrealizedWindow;
-- 
1.6.0.4



More information about the xorg-devel mailing list