svn merge ^/branches/released .

2 files changed, 8 insertions, 11 deletions

diff --git a/libX11/src/xcb_io.c b/libX11/src/xcb_io.c
index d1c5425c6..c2170b4eb 100644
--- a/libX11/src/xcb_io.c
+++ b/libX11/src/xcb_io.c
@@ -235,25 +235,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)

@@ -365,11 +360,11 @@ void _XReadEvents(Display *dpy)
 		response = poll_for_response(dpy);

 		if(response)

 			handle_response(dpy, response, False);

-		else if (dpy->xcb->pending_requests && dpy->xcb->pending_requests->reply_waiter)

+		else if(dpy->xcb->pending_requests->reply_waiter)

 		{ /* need braces around ConditionWait */

 			ConditionWait(dpy, dpy->xcb->reply_notify);

 		}

-		else if(xcb_connection_has_error(dpy->xcb->connection))

+		else

 			_XIOError(dpy);

 	}

 

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