xserver: Branch 'master'

[Tiago Vignatti]

 hw/xfree86/common/xf86VGAarbiter.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4982bbc3b49b1b61e63a8461ea803e41318c8187
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Fri Sep 18 12:36:11 2009 +0300

    xfree86: vgaarb: missing wrapping macro
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>

diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
index 9b72331..b240998 100644
--- a/hw/xfree86/common/xf86VGAarbiter.c
+++ b/hw/xfree86/common/xf86VGAarbiter.c
@@ -181,7 +181,9 @@ xf86VGAarbiterWrapFunctions(void)
 
     for (i = 0; i < xf86NumScreens; i++) {
         pScreen = xf86Screens[i]->pScreen;
+#ifdef RENDER
         ps = GetPictureScreenIfSet(pScreen);
+#endif
         pScrn = xf86Screens[pScreen->myNum];
         PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);