Changeset b75671d for sock.h

Timestamp:

2015-06-17T22:47:26Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

b441614

Parents:

d832164 (diff), 2f99f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into parson

File:

• sock.h (modified) (1 diff)

sock.h

@@ -9 +9 @@
 #define sock_make_nonblocking(fd) fcntl(fd, F_SETFL, O_NONBLOCK)
 #define sock_make_blocking(fd) fcntl(fd, F_SETFL, 0)
-#define sockerr_again() (errno == EINPROGRESS || errno == EINTR)
+#define sockerr_again() (errno == EINPROGRESS || errno == EINTR || errno == EAGAIN)
 void closesocket(int fd);