From a06cbd678492d09d2eedd1ad571561c2bbab9030 Mon Sep 17 00:00:00 2001 From: Alexei Svitkine Date: Sun, 9 Aug 2015 18:31:30 -0400 Subject: [PATCH] Fix non-Windows build. --- BasiliskII/src/slirp/socket.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/BasiliskII/src/slirp/socket.c b/BasiliskII/src/slirp/socket.c index 5a36bb0e..2c0e067e 100644 --- a/BasiliskII/src/slirp/socket.c +++ b/BasiliskII/src/slirp/socket.c @@ -14,6 +14,12 @@ #include #endif +#ifdef _WIN32 +#define IS_EAGAIN(e) ((e) == WSAEINTR || (e) == EAGAIN) +#else +#define IS_EAGAIN(e) ((e) == EAGAIN) +#endif + void so_init() { @@ -161,7 +167,7 @@ soread(so) #endif if (nn <= 0) { int error = WSAGetLastError(); - if (nn < 0 && (error == WSAEINTR || error == EAGAIN)) + if (nn < 0 && IS_EAGAIN(error)) return 0; else { DEBUG_MISC((dfd, " --- soread() disconnected, nn = %d, errno = %d-%s\n", nn, errno,strerror(errno))); @@ -348,7 +354,7 @@ sowrite(so) /* This should never happen, but people tell me it does *shrug* */ if (nn < 0) { int error = WSAGetLastError(); - if (error == EAGAIN || error == WSAEINTR) + if (IS_EAGAIN(error)) return 0; }