xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 Xi/querydp.c |    2 +-
 Xi/setbmap.c |    3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 1d20b9021e8aecb942619f64017cc2fc31f02d29
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Sun Jun 14 18:21:43 2009 +1000

    Xi: fix wrong bit->byte conversion in ProcXIQueryPointer
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/Xi/querydp.c b/Xi/querydp.c
index bc6feb1..e5bf98d 100644
--- a/Xi/querydp.c
+++ b/Xi/querydp.c
@@ -132,7 +132,7 @@ ProcXIQueryPointer(ClientPtr client)
     if (pDev->button)
     {
         int i, down;
-        rep.buttons_len = ((pDev->button->numButtons/8) + 3)/4;
+        rep.buttons_len = (((pDev->button->numButtons + 7)/8) + 3)/4;
         rep.length += rep.buttons_len;
         buttons = xcalloc(rep.buttons_len, 4);
         if (!buttons)
commit 9afc3241c157e5c19454f913c7105b3fdfa97ec4
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Sun Jun 14 18:24:22 2009 +1000

    Xi: remove un-used IsOn macro.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index f29389d..e7b8d4a 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -50,9 +50,6 @@ SOFTWARE.
  *
  */
 
-#define IsOn(ptr, bit) \
-	(((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7)))
-
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif