From 541d4add61bb3e6c462b2b9ca073a9b71989636a Mon Sep 17 00:00:00 2001
From: Dan Werthimer <danw@ssl.berkeley.edu>
Date: Fri, 11 Jul 2003 00:50:48 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=1667
---
 client/net_xfer.C       | 16 +++++++++-------
 win_build/boinc_gui.dsp |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/client/net_xfer.C b/client/net_xfer.C
index de48c0a95e..672aa0521b 100644
--- a/client/net_xfer.C
+++ b/client/net_xfer.C
@@ -67,7 +67,9 @@
 #include "client_state.h"
 #include "message.h"
 
-#if !GETSOCKOPT_SOCKLEN_T
+#ifdef _WIN32
+typedef int socklen_t;
+#elif !GETSOCKOPT_SOCKLEN_T
 typedef size_t socklen_t;
 #endif
 
@@ -383,13 +385,13 @@ int NET_XFER_SET::do_select(double& bytes_transferred, timeval& timeout) {
         fd = nxp->socket;
         if (FD_ISSET(fd, &read_fds) || FD_ISSET(fd, &write_fds)) {
             if (!nxp->is_connected) {
-// #ifdef _WIN32
-//                 getsockopt(fd, SOL_SOCKET, SO_ERROR, (char *)&n, (int *)&intsize);
-// #elif __APPLE__
-//                 getsockopt(fd, SOL_SOCKET, SO_ERROR, &n, (int *)&intsize);
-// #else
+#ifdef _WIN32
+                getsockopt(fd, SOL_SOCKET, SO_ERROR, (char *)&n, &intsize);
+#elif __APPLE__
+                getsockopt(fd, SOL_SOCKET, SO_ERROR, &n, (int *)&intsize);
+#else
                 getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&n, &intsize);
-// #endif
+#endif
                 if (n) {
                     scope_messages.printf("NET_XFER_SET::do_select(): socket %d connect failed\n", fd);
                     nxp->error = ERR_CONNECT;
diff --git a/win_build/boinc_gui.dsp b/win_build/boinc_gui.dsp
index 7ad6fa32e9..68912188b5 100755
--- a/win_build/boinc_gui.dsp
+++ b/win_build/boinc_gui.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../lib/" /I "../api/" /I "../RSAEuro/source/" /I "../client/win/" /I "../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D MAJOR_VERSION=1 /D MINOR_VERSION=04 /YX /FD /c /Tp
+# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../lib/" /I "../api/" /I "../RSAEuro/source/" /I "../client/win/" /I "../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c /Tp
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /Gi /GX /ZI /Od /I "../lib/" /I "../api/" /I "../RSAEuro/source/" /I "../client/win/" /I "../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D MAJOR_VERSION=1 /D MINOR_VERSION=04 /FR /YX /FD /GZ /c /Tp
+# ADD CPP /nologo /MTd /W3 /Gm /Gi /GX /ZI /Od /I "../lib/" /I "../api/" /I "../RSAEuro/source/" /I "../client/win/" /I "../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /GZ /c /Tp
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"