From 5bb359288aac7b23042dc168608f2ced46c851da Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 22 Jun 2010 06:37:41 +0000 Subject: libXext and libX11 git update 22/6/2010 --- libX11/src/xcb_io.c | 13 ++++--------- libXext/configure.ac | 2 ++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libX11/src/xcb_io.c b/libX11/src/xcb_io.c index ebf217972..a0692fec1 100644 --- a/libX11/src/xcb_io.c +++ b/libX11/src/xcb_io.c @@ -232,25 +232,20 @@ static xcb_generic_reply_t *poll_for_response(Display *dpy) void *response; xcb_generic_error_t *error; PendingRequest *req; - - response = poll_for_event(dpy); - if (response) - return response; - - while((req = dpy->xcb->pending_requests) && + while(!(response = poll_for_event(dpy)) && + (req = dpy->xcb->pending_requests) && !req->reply_waiter && xcb_poll_for_reply(dpy->xcb->connection, req->sequence, &response, &error)) { assert(XLIB_SEQUENCE_COMPARE(req->sequence, <=, dpy->request)); dpy->last_request_read = req->sequence; if(response) - return response; + break; dequeue_pending_request(dpy, req); if(error) return (xcb_generic_reply_t *) error; } - - return NULL; + return response; } static void handle_response(Display *dpy, xcb_generic_reply_t *response, Bool in_XReply) diff --git a/libXext/configure.ac b/libXext/configure.ac index 5ec105625..8c5311fe3 100644 --- a/libXext/configure.ac +++ b/libXext/configure.ac @@ -17,6 +17,8 @@ m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) XORG_DEFAULT_OPTIONS +XORG_ENABLE_SPECS +XORG_WITH_GROFF AM_CONFIG_HEADER([config.h]) # Determine .so library version per platform -- cgit v1.2.3