diff options
Diffstat (limited to 'bufferevent_sock.c')
| -rw-r--r-- | bufferevent_sock.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/bufferevent_sock.c b/bufferevent_sock.c index 089aedb4..a37e302a 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -26,9 +26,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> - #include "event2/event-config.h" +#include "evconfig-private.h" + +#include <sys/types.h> #ifdef _EVENT_HAVE_SYS_TIME_H #include <sys/time.h> @@ -45,7 +46,7 @@ #include <unistd.h> #endif -#ifdef WIN32 +#ifdef _WIN32 #include <winsock2.h> #include <ws2tcpip.h> #endif @@ -70,7 +71,7 @@ #include "mm-internal.h" #include "bufferevent-internal.h" #include "util-internal.h" -#ifdef WIN32 +#ifdef _WIN32 #include "iocp-internal.h" #endif @@ -232,7 +233,7 @@ bufferevent_writecb(evutil_socket_t fd, short event, void *arg) goto done; } else { connected = 1; -#ifdef WIN32 +#ifdef _WIN32 if (BEV_IS_ASYNC(bufev)) { event_del(&bufev->ev_write); bufferevent_async_set_connected(bufev); @@ -314,7 +315,7 @@ bufferevent_socket_new(struct event_base *base, evutil_socket_t fd, struct bufferevent_private *bufev_p; struct bufferevent *bufev; -#ifdef WIN32 +#ifdef _WIN32 if (base && event_base_get_iocp(base)) return bufferevent_async_new(base, fd, options); #endif @@ -371,7 +372,7 @@ bufferevent_socket_connect(struct bufferevent *bev, ownfd = 1; } if (sa) { -#ifdef WIN32 +#ifdef _WIN32 if (bufferevent_async_can_connect(bev)) { bufferevent_setfd(bev, fd); r = bufferevent_async_connect(bev, fd, sa, socklen); @@ -386,7 +387,7 @@ bufferevent_socket_connect(struct bufferevent *bev, if (r < 0) goto freesock; } -#ifdef WIN32 +#ifdef _WIN32 /* ConnectEx() isn't always around, even when IOCP is enabled. * Here, we borrow the socket object's write handler to fall back * on a non-blocking connect() when ConnectEx() is unavailable. */ |