[Xcb-commit] src

[Jamey Sharp]

 src/xcb_out.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e06955ed66cb499ada52b8add6709edd38d70054
Author: Jamey Sharp <jamey at minilop.net>
Date:   Mon Jul 6 13:14:35 2009 -0700

    Fix precedence bug: wrong length for big-requests preceded by sync.
    
    Also replace excessively clever use of bitwise OR with equivalent
    addition.
    
    Reported-by: Geoffrey Li <geoffrey at seitopos.com>
    Signed-off-by: Jamey Sharp <jamey at minilop.net>
    Signed-off-by: Josh Triplett <josh at joshtriplett.org>

diff --git a/src/xcb_out.c b/src/xcb_out.c
index 4c6ab13..b3050fe 100644
--- a/src/xcb_out.c
+++ b/src/xcb_out.c
@@ -242,7 +242,7 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect
             vector[1].iov_base = (uint32_t *) vector[1].iov_base + 1;
             vector[1].iov_len -= sizeof(uint32_t);
         }
-        vector[0].iov_len = sizeof(uint32_t) * (prefix[0] ? 1 : 0 | prefix[2] ? 2 : 0);
+        vector[0].iov_len = sizeof(uint32_t) * ((prefix[0] ? 1 : 0) + (prefix[2] ? 2 : 0));
         vector[0].iov_base = prefix + !prefix[0];
     }