xserver: Branch 'master'

[Peter Hutterer]

 dix/events.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7bbf05d9aa75b536a5321abf51f37852b8f109ed
Author: Shunichi Fuji <palglowr at gmail.com>
Date:   Tue Feb 10 14:44:18 2009 +0900

    dix: build fix if PANORAMIX is not defined.
    
    Signed-off-by: Shunichi Fuji <palglowr at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/events.c b/dix/events.c
index 77badfd..0db2d6a 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -670,8 +670,8 @@ CheckPhysLimits(
 #ifdef PANORAMIX
         if (!noPanoramiXExtension)
             XineramaSetCursorPosition (pDev, new.x, new.y, generateEvents);
-#endif
         else
+#endif
         {
             if (pScreen != pSprite->hotPhys.pScreen)
                 pSprite->hotPhys = new;