diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-05-02 16:24:05 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-05-02 16:24:05 +0000 |
| commit | 5a3eddf03f9a2c2d9bf52326e504be1555e2882f (patch) | |
| tree | 659f4ae5e2222fa89d193d4f7ef79e4568870b4c | |
| parent | d5ca076379a82677d7148456e975bcb2f9f1b4b5 (diff) | |
| download | libevent-5a3eddf03f9a2c2d9bf52326e504be1555e2882f.tar.gz | |
Use fewer _compat.h headers in our own code.
svn:r1268
| -rw-r--r-- | buffer_iocp.c | 1 | ||||
| -rw-r--r-- | bufferevent.c | 1 | ||||
| -rw-r--r-- | bufferevent_async.c | 2 | ||||
| -rw-r--r-- | bufferevent_filter.c | 2 | ||||
| -rw-r--r-- | bufferevent_sock.c | 1 | ||||
| -rw-r--r-- | http.c | 9 |
6 files changed, 6 insertions, 10 deletions
diff --git a/buffer_iocp.c b/buffer_iocp.c index bae08434..7da74431 100644 --- a/buffer_iocp.c +++ b/buffer_iocp.c @@ -32,7 +32,6 @@ */ #include "event2/buffer.h" -#include "event2/buffer_compat.h" #include "event2/util.h" #include "event2/thread.h" #include "event-config.h" diff --git a/bufferevent.c b/bufferevent.c index 21a5e87d..980d1468 100644 --- a/bufferevent.c +++ b/bufferevent.c @@ -51,7 +51,6 @@ #include "event2/util.h" #include "event2/bufferevent.h" #include "event2/buffer.h" -#include "event2/buffer_compat.h" #include "event2/bufferevent_struct.h" #include "event2/bufferevent_compat.h" #include "event2/event.h" diff --git a/bufferevent_async.c b/bufferevent_async.c index 50cf448b..2889ce95 100644 --- a/bufferevent_async.c +++ b/bufferevent_async.c @@ -51,9 +51,7 @@ #include "event2/util.h" #include "event2/bufferevent.h" #include "event2/buffer.h" -#include "event2/buffer_compat.h" #include "event2/bufferevent_struct.h" -#include "event2/bufferevent_compat.h" #include "event2/event.h" #include "log-internal.h" #include "mm-internal.h" diff --git a/bufferevent_filter.c b/bufferevent_filter.c index 9a45faf0..fa7c1f54 100644 --- a/bufferevent_filter.c +++ b/bufferevent_filter.c @@ -52,9 +52,7 @@ #include "event2/util.h" #include "event2/bufferevent.h" #include "event2/buffer.h" -#include "event2/buffer_compat.h" #include "event2/bufferevent_struct.h" -#include "event2/bufferevent_compat.h" #include "event2/event.h" #include "log-internal.h" #include "mm-internal.h" diff --git a/bufferevent_sock.c b/bufferevent_sock.c index 78ea1c17..877c912c 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -55,7 +55,6 @@ #include "event2/util.h" #include "event2/bufferevent.h" #include "event2/buffer.h" -#include "event2/buffer_compat.h" #include "event2/bufferevent_struct.h" #include "event2/bufferevent_compat.h" #include "event2/event.h" @@ -1193,9 +1193,12 @@ evhttp_connection_cb(struct bufferevent *bufev, void *arg) if (evcon->timeout == -1) bufferevent_settimeout(evcon->bufev, HTTP_READ_TIMEOUT, HTTP_WRITE_TIMEOUT); - else - bufferevent_settimeout(evcon->bufev, - evcon->timeout, evcon->timeout); + else { + struct timeval tv; + tv.tv_sec = evcon->timeout; + tv.tv_usec = 0; + bufferevent_set_timeouts(evcon->bufev, &tv, &tv); + } /* try to start requests that have queued up on this connection */ evhttp_request_dispatch(evcon); |