xserver: Branch 'server-1.10-branch' - 3 commits

[Jeremy Huddleston]

 dix/events.c  |    2 +-
 fb/fbbltone.c |    4 ++--
 test/input.c  |    3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 9551f5041915fa00ca243a279efb55de2ff11a00
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue May 31 14:48:33 2011 +1000

    dix: fix an error message.
    
    event type, not device type.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit f94898928dfaf8df648bc3eea7d304826b7ac1b8)
    
    Conflicts:
    
    	dix/events.c

diff --git a/dix/events.c b/dix/events.c
index f0ea576..eefcdef 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -410,7 +410,7 @@ GetEventFilter(DeviceIntPtr dev, xEvent *event)
         return filters[dev ? dev->id : 0][event->u.u.type];
     else if (XI2_EVENT(event))
         return (1 << (((xXIDeviceEvent*)event)->evtype % 8));
-    ErrorF("[dix] Unknown device type %d. No filter\n", event->u.u.type);
+    ErrorF("[dix] Unknown event type %d. No filter\n", event->u.u.type);
     return 0;
 }
 
commit 75f75d12cf69ba9b7f14ddf04338ad2df7315550
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu May 19 14:50:17 2011 +1000

    test: don't test for double alignment on i386. (#36986)
    
    i386 is one of the few architectures that doesn't need double alignment.
    
    X.Org Bug 36986 <http://bugs.freedesktop.org/show_bug.cgi?id=36986>
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit 8ef0974874f322e3ce2f3e6be4ab3c7e73a7b380)
    
    Conflicts:
    
    	test/input.c

diff --git a/test/input.c b/test/input.c
index 4d840b9..4c80fcc 100644
--- a/test/input.c
+++ b/test/input.c
@@ -1213,8 +1213,11 @@ static void dix_valuator_alloc(void)
 
         g_assert(v);
         g_assert(v->numAxes == num_axes);
+#ifndef __i386__
+        /* must be double-aligned on 64 bit */
         g_assert(((void*)v->axisVal - (void*)v) % sizeof(double) == 0);
         g_assert(((void*)v->axes - (void*)v) % sizeof(double) == 0);
+#endif
         num_axes ++;
     }
 
commit 2647867c7c8e12fac29b4bd9805efb40d6d87c70
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun May 22 13:50:14 2011 -0700

    fbbltone.c: Mark bitmasks as unsigned ints
    
    Clears many Sun compiler warnings:
    "fbbltone.c", line 491: warning: integer overflow detected: op "<<"
    "fbbltone.c", line 491: warning: integer overflow detected: op "<<"
    "fbbltone.c", line 491: warning: integer overflow detected: op "<<"
    "fbbltone.c", line 491: warning: initializer will be sign-extended: -16777216
    "fbbltone.c", line 491: warning: integer overflow detected: op "<<"
    "fbbltone.c", line 491: warning: initializer will be sign-extended: -1
    "fbbltone.c", line 495: warning: integer overflow detected: op "<<"
    "fbbltone.c", line 495: warning: integer overflow detected: op "<<"
    "fbbltone.c", line 495: warning: integer overflow detected: op "<<"
    "fbbltone.c", line 495: warning: initializer will be sign-extended: -256
    "fbbltone.c", line 495: warning: integer overflow detected: op "<<"
    "fbbltone.c", line 495: warning: initializer will be sign-extended: -1
    "fbbltone.c", line 499: warning: integer overflow detected: op "<<"
    "fbbltone.c", line 499: warning: integer overflow detected: op "<<"
    "fbbltone.c", line 499: warning: integer overflow detected: op "<<"
    "fbbltone.c", line 499: warning: initializer will be sign-extended: -65536
    "fbbltone.c", line 499: warning: integer overflow detected: op "<<"
    "fbbltone.c", line 499: warning: initializer will be sign-extended: -1
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Jamey Sharp <jamey at minilop.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 1b2d17748f0154da142e9b421d4f6a46e4e5a18c)

diff --git a/fb/fbbltone.c b/fb/fbbltone.c
index 5d5d2e6..97546b9 100644
--- a/fb/fbbltone.c
+++ b/fb/fbbltone.c
@@ -438,8 +438,8 @@ fbBltOne (FbStip    *src,
 
 #define Mask24(x,r) (Mask24Pos(x,r) < FB_UNIT ? \
 		     (Mask24Pos(x,r) < 0 ? \
-		      0xffffff >> Mask24Neg (x,r) : \
-		      0xffffff << Mask24Check(x,r)) : 0)
+		      0xffffffU >> Mask24Neg (x,r) : \
+		      0xffffffU << Mask24Check(x,r)) : 0)
 
 #define SelMask24(b,n,r)	((((b) >> n) & 1) * Mask24(n,r))