Use fewer _compat.h headers in our own code.

svn:r1268

diff --git a/buffer_iocp.c b/buffer_iocp.c
index bae08434e0a8cf17b0b938f1654ff562b76b1e9e..7da74431b8006536075df4b188cd130eaf70f21e 100644 (file)
--- 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 21a5e87d7226f5f5529c78375e661da51f0a2b60..980d1468ddd2879a5b6ba821bcbf1d854009d1c7 100644 (file)
--- 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 50cf448b9e213b4f84d8fde098b13098dd707e3a..2889ce9507ccc5c4df205abd932a773706fd75d1 100644 (file)
--- 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 9a45faf0ec6631b02cdcd2cb1763925cc8b6cd4c..fa7c1f54739af8f0891d7e9f70062b8f84a2e84c 100644 (file)
--- 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 78ea1c1713c8025fac0cbe40facda51d01d7921a..877c912c193160e21eed85d10a99ede1e299fc6a 100644 (file)
--- 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"

diff --git a/http.c b/http.c
index 1e2c57875df0de8bdc759deb746f7d12cd404885..496e495bbaa55ec71451a8fef53d5e32ee132405 100644 (file)
--- a/http.c
+++ b/http.c
@@ -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);