From aff9f070811bcc16b944f57c32c0d2c524ba3fd6 Mon Sep 17 00:00:00 2001
From: jsalmon3 <>
Date: Fri, 17 Oct 2003 23:08:47 +0000
Subject: [PATCH] Fixed winsock error checking
---
src/network/lowlevel.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/network/lowlevel.cpp b/src/network/lowlevel.cpp
index 61bea8fde..1ece4fb06 100644
--- a/src/network/lowlevel.cpp
+++ b/src/network/lowlevel.cpp
@@ -299,7 +299,7 @@ global int NetSocketAddr(const Socket sock)
sizeof(localAddr), &bytesReturned, NULL, NULL);
if (wsError == SOCKET_ERROR) {
DebugLevel0Fn("SIOCGIFCONF:WSAIoctl(SIO_GET_INTERFACE_LIST) - errno %ld\n" _C_
- GetLastError());
+ WSA_GetLastError());
}
// parse interface information
@@ -523,7 +523,7 @@ global int NetConnectTCP(Socket sockfd, unsigned long addr, int port)
}
memset(&sa, 0, sizeof(sa));
- memcpy(&sa.sin_addr, &addr,sizeof(addr));
+ memcpy(&sa.sin_addr, &addr, sizeof(addr));
sa.sin_family = AF_INET;
sa.sin_port = htons(port);
@@ -562,8 +562,8 @@ global int NetSocketReady(Socket sockfd, int timeout)
// Data available?
retval = select(sockfd + 1, &mask, NULL, NULL, &tv);
-#ifdef _MSC_VER
- } while (retval == SOCKET_ERROR && errno == WSAEINTR);
+#ifdef USE_WINSOCK
+ } while (retval == SOCKET_ERROR && WSAGetLastError() == WSAEINTR);
#else
} while (retval == -1 && errno == EINTR);
#endif