xserver: Branch 'master'

[Alex Deucher]

 hw/xfree86/modes/xf86Cursors.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 267352579612155adfd4743432d6569b2cdeebde
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Wed Mar 19 19:12:37 2008 -0400

    Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
    
    See bug 11796

diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index 08cf78d..4fe94f3 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -137,7 +137,9 @@ cursor_bitpos (int flags, int x, Bool mask)
 	mask = !mask;
     if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)
 	x = (x & ~3) | (3 - (x & 3));
+#if X_BYTE_ORDER == X_LITTLE_ENDIAN
     if (flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST)
+#endif
 	x = (x & ~7) | (7 - (x & 7));
     if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1)
 	x = (x << 1) + mask;