Make TcpSocket build on Win32 again.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@205 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/network/TcpSocket.cxx b/network/TcpSocket.cxx
index 3fe4a65..1d0de9f 100644
--- a/network/TcpSocket.cxx
+++ b/network/TcpSocket.cxx
@@ -69,7 +69,7 @@
for (port = TUNNEL_PORT_OFFSET + 99; port > TUNNEL_PORT_OFFSET; port--) {
addr.sin_port = htons ((unsigned short) port);
if (bind (sock, (struct sockaddr *)&addr, sizeof (addr)) == 0) {
- close (sock);
+ closesocket (sock);
return port;
}
}
@@ -137,8 +137,10 @@
for (;;) {
if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) != 0) {
int e = errorNumber;
+#ifndef WIN32
if (e == EINTR)
continue;
+#endif
closesocket(sock);
throw SocketException("unable to connect to host", e);
} else break;