diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-08-28 14:51:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-08-28 14:51:36 -0400 |
| commit | 904254f975b260b2a00b299a01db26b4f81407a3 (patch) | |
| tree | 7d73ca8a5ae43dcd8c131366f955f0eec0fad1be /bufferevent_sock.c | |
| parent | 6d2613beccc34050b615ffbedc4196d457b46597 (diff) | |
| parent | e6af35d762822e56e97cca3708ffee291c867d20 (diff) | |
| download | libevent-904254f975b260b2a00b299a01db26b4f81407a3.tar.gz | |
Merge remote-tracking branch 'origin/patches-2.0'
Diffstat (limited to 'bufferevent_sock.c')
| -rw-r--r-- | bufferevent_sock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bufferevent_sock.c b/bufferevent_sock.c index aa3cadfc..a37e302a 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -686,6 +686,7 @@ be_socket_ctrl(struct bufferevent *bev, enum bufferevent_ctrl_op op, data->fd = event_get_fd(&bev->ev_read); return 0; case BEV_CTRL_GET_UNDERLYING: + case BEV_CTRL_CANCEL_ALL: default: return -1; } |