cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-19 09:15:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

make mingw happy; from Nick Mathewson

Browse Source 
svn:r322
This commit is contained in:
Niels Provos 2007-02-09 07:49:55 +00:00
parent faf5f73a69
commit bfb9f44f37
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
http.c
View File

@ -112,6 +112,28 @@ fake_freeaddrinfo(struct addrinfo *ai)
}
#endif
#ifndef MIN
#define MIN(a,b) (((a)<(b))?(a):(b))
#endif
static int
event_make_socket_nonblocking(int fd)
{
#ifdef WIN32
{
unsigned long nonblocking = 1;
ioctlsocket(fd, FIONBIO, (unsigned long*) &nonblocking);
}
#else
if (fcntl(fd, F_SETFL, O_NONBLOCK) == -1) {
event_warn("fcntl(O_NONBLOCK)");
return -1;
}
#endif
return 0;
}
extern int debug;
static int make_socket_ai(int should_bind, struct addrinfo *);
@ -1804,10 +1826,9 @@ accept_socket(int fd, short what, void *arg)
event_warn("%s: bad accept", __func__);
return;
}
if (fcntl(nfd, F_SETFL, O_NONBLOCK) == -1) {
event_warn("fcntl(O_NONBLOCK)");
if (event_make_socket_nonblocking(fd) < 0)
return;
}
evhttp_get_request(http, nfd, (struct sockaddr *)&ss, addrlen);
}
@ -2151,17 +2172,10 @@ make_socket_ai(int should_bind, struct addrinfo *ai)
return (-1);
}
#ifdef WIN32
{
unsigned long nonblocking = 1;
ioctlsocket(fd, FIONBIO, (unsigned long*) &nonblocking);
}
#else
if (fcntl(fd, F_SETFL, O_NONBLOCK) == -1) {
event_warn("fcntl(O_NONBLOCK)");
if (event_make_socket_nonblocking(fd) < 0)
goto out;
}
#ifndef WIN32
if (fcntl(fd, F_SETFD, 1) == -1) {
event_warn("fcntl(F_SETFD)");
goto out;