diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-10 10:38:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-10 10:42:30 +0200 |
| commit | 2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7 (patch) | |
| tree | a32e3d5f8bb662ba5c14a72d97a553c4927c0b76 /libxcb/src | |
| parent | d53900c52abc2402f978b72278712e4bcdbde9f2 (diff) | |
| parent | 889d7dd8e94a5538f388cc619115bf5c0b6fc0b7 (diff) | |
| download | vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.tar.gz vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.tar.bz2 vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013
Conflicts:
mesalib/src/glsl/.gitignore
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winsetsp.c
Diffstat (limited to 'libxcb/src')
| -rw-r--r-- | libxcb/src/libxcb.def | 3 | ||||
| -rw-r--r-- | libxcb/src/xcb.h | 1 | ||||
| -rw-r--r-- | libxcb/src/xcb_conn.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/libxcb/src/libxcb.def b/libxcb/src/libxcb.def index 01ee17334..1d9e1bbef 100644 --- a/libxcb/src/libxcb.def +++ b/libxcb/src/libxcb.def @@ -46,7 +46,6 @@ EXPORTS xcb_screen_next
xcb_setup_roots_iterator
xcb_setup_roots_length
- xcb_shape_id
xcb_shape_query_extents
xcb_shape_query_extents_reply
xcb_take_socket
@@ -56,4 +55,4 @@ EXPORTS xcb_visualtype_next
xcb_wait_for_event
xcb_wait_for_reply
- xcb_writev
\ No newline at end of file + xcb_writev
diff --git a/libxcb/src/xcb.h b/libxcb/src/xcb.h index 4722a270c..dda28bcdc 100644 --- a/libxcb/src/xcb.h +++ b/libxcb/src/xcb.h @@ -279,7 +279,6 @@ xcb_generic_event_t *xcb_wait_for_event(xcb_connection_t *c); /** * @brief Returns the next event or error from the server. * @param c: The connection to the X server. - * error status of the operation. * @return The next event from the server. * * Returns the next event or error from the server, if one is diff --git a/libxcb/src/xcb_conn.c b/libxcb/src/xcb_conn.c index 212aa2dd0..403942b79 100644 --- a/libxcb/src/xcb_conn.c +++ b/libxcb/src/xcb_conn.c @@ -471,14 +471,14 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec */ int may_read = c->in.reading == 1 || !count; #if USE_POLL - if(may_read && (fd.revents & POLLIN) == POLLIN) + if(may_read && (fd.revents & POLLIN) != 0) #else if(may_read && FD_ISSET(c->fd, &rfds)) #endif ret = ret && _xcb_in_read(c); #if USE_POLL - if((fd.revents & POLLOUT) == POLLOUT) + if((fd.revents & POLLOUT) != 0) #else if(FD_ISSET(c->fd, &wfds)) #endif |