X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_out.c;h=f12a0713e758ccf7cf30612cfb4166d23393818e;hb=936077cbc87addc914d33ab79a7d066f0f51d3ad;hp=2b1a434c728140773b3bd189ae08b4db498ab642;hpb=b83f18a4cc2303dfda59807d56e16bbc5c18b09d;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_out.c b/src/xcb_out.c
index 2b1a434..f12a071 100644
--- a/src/xcb_out.c
+++ b/src/xcb_out.c
@@ -120,7 +120,7 @@ unsigned int XCBSendRequest(XCBConnection *c, int flags, struct iovec *vector, c
             longlen += vector[i].iov_len;
             if(!vector[i].iov_base)
             {
-                vector[i].iov_base = (caddr_t) pad;
+                vector[i].iov_base = (char *) pad;
                 assert(vector[i].iov_len <= sizeof(pad));
             }
         }
@@ -144,8 +144,10 @@ unsigned int XCBSendRequest(XCBConnection *c, int flags, struct iovec *vector, c
     flags &= ~XCB_REQUEST_RAW;
 
     /* do we need to work around the X server bug described in glx.xml? */
-    if(req->ext && !req->isvoid && strcmp(req->ext->name, "GLX") &&
-            ((req->opcode == 17 && ((CARD32 *) vector[0].iov_base)[0] == 0x10004) ||
+    /* XXX: GetFBConfigs won't use BIG-REQUESTS in any sane
+     * configuration, but that should be handled here anyway. */
+    if(req->ext && !req->isvoid && !strcmp(req->ext->name, "GLX") &&
+            ((req->opcode == 17 && ((CARD32 *) vector[0].iov_base)[1] == 0x10004) ||
              req->opcode == 21))
         workaround = WORKAROUND_GLX_GET_FB_CONFIGS_BUG;
 
@@ -165,7 +167,8 @@ unsigned int XCBSendRequest(XCBConnection *c, int flags, struct iovec *vector, c
 
     request = ++c->out.request;
     assert(request != 0);
-    _xcb_in_expect_reply(c, request, workaround, flags);
+    if(workaround != WORKAROUND_NONE || flags != 0)
+        _xcb_in_expect_reply(c, request, workaround, flags);
     if(!req->isvoid)
         c->in.request_expected = c->out.request;