From 38aec9ec7cb7d4bd135b0a02ce9f186871d1f0b9 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 23 Oct 2009 22:38:35 +0000 Subject: [PATCH] Tweaks to IOCP interface. svn:r1461 --- bufferevent_sock.c | 2 +- event.c | 2 +- test/regress_iocp.c | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/bufferevent_sock.c b/bufferevent_sock.c index 5dec03f8..1591765f 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -270,7 +270,7 @@ bufferevent_socket_new(struct event_base *base, evutil_socket_t fd, struct bufferevent *bufev; #ifdef WIN32 - if (base && base->iocp) + if (base && event_base_get_iocp(base)) return bufferevent_async_new(base, fd, options); #endif diff --git a/event.c b/event.c index 7078a0a5..33a50d7b 100644 --- a/event.c +++ b/event.c @@ -342,7 +342,7 @@ event_base_new_with_config(struct event_config *cfg) } #ifdef WIN32 - if ((cfg->flags & EVENT_BASE_FLAG_STARTUP_IOCP) != 0) + if (cfg && (cfg->flags & EVENT_BASE_FLAG_STARTUP_IOCP)) event_base_start_iocp(base); #endif diff --git a/test/regress_iocp.c b/test/regress_iocp.c index 51953cbe..cd28fb7b 100644 --- a/test/regress_iocp.c +++ b/test/regress_iocp.c @@ -195,11 +195,6 @@ end: evbuffer_free(wbuf); } -/*FIXME get this from a header once it's in one. */ -struct bufferevent * -bufferevent_async_new(struct event_base *base, - evutil_socket_t fd, enum bufferevent_options options); - static void test_iocp_bufferevent_async(void *ptr) { -- 2.50.1