external/uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Winsock fixes.

Browse Source
This commit is contained in:
Jan Vidar Krey
2011-08-08 00:07:05 +02:00
parent d01813ef48
commit 3bc764adf5
3 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/network/network.c
View File

@@ -371,8 +371,13 @@ int net_accept(int fd, struct ip_addr_encap* ipaddr)
case EOPNOTSUPP:
errno = EWOULDBLOCK;
#endif
#ifdef WINSOCK
case WSAEWOULDBLOCK:
break;
#else
case EWOULDBLOCK:
break;
#endif
default:
net_error_out(fd, "net_accept");
net_stats_add_error();
@@ -418,7 +423,11 @@ int net_connect(int fd, const struct sockaddr *serv_addr, socklen_t addrlen)
int ret = connect(fd, serv_addr, addrlen);
if (ret == -1)
{
#ifdef WINSOCK
if (net_error() != WSAEINPROGRESS)
#else
if (net_error() != EINPROGRESS)
#endif
{
net_error_out(fd, "net_connect");
net_stats_add_error();
@@ -684,7 +693,11 @@ ssize_t net_recv(int fd, void* buf, size_t len, int flags)
}
else
{
#ifdef WINSOCK
if (net_error() != WSAEWOULDBLOCK)
#else
if (net_error() != EWOULDBLOCK)
#endif
{
/* net_error_out(fd, "net_recv"); */
net_stats_add_error();
@@ -703,7 +716,11 @@ ssize_t net_send(int fd, const void* buf, size_t len, int flags)
}
else
{
#ifdef WINSOCK
if (net_error() != WSAEWOULDBLOCK)
#else
if (net_error() != EWOULDBLOCK)
#endif
{
/* net_error_out(fd, "net_send"); */
net_stats_add_error();