diff --git a/checkin_notes b/checkin_notes index 90c032bcbd..53277f9c7c 100755 --- a/checkin_notes +++ b/checkin_notes @@ -504,6 +504,7 @@ Eric H June 19, 2002 Eric H June 20, 2002 - added soft link support via XML tags - fixed Windows ASCII/binary bug + - Added Windows networking support - Fixed some bad indenting api/ @@ -511,4 +512,11 @@ Eric H June 20, 2002 api.h lib/ md5_file.C - + client/ + cs_scheduler.C + net_xfer.C + win_net.C (added) + win_net.h (added) + win_main.C + windows_cpp.h + diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C index 790809ac51..d8dc04b0ec 100644 --- a/client/cs_scheduler.C +++ b/client/cs_scheduler.C @@ -106,7 +106,7 @@ PROJECT* CLIENT_STATE::choose_project() { } int CLIENT_STATE::make_scheduler_request(PROJECT* p, int work_req) { - FILE* f = fopen(SCHED_OP_REQUEST_FILE, "w"); + FILE* f = fopen(SCHED_OP_REQUEST_FILE, "wb"); unsigned int i; RESULT* rp; diff --git a/client/net_xfer.C b/client/net_xfer.C index 2e411a91b4..32d804a897 100644 --- a/client/net_xfer.C +++ b/client/net_xfer.C @@ -87,7 +87,8 @@ int NET_XFER::open_server() { retval = connect(fd, (sockaddr*)&addr, sizeof(addr)); if (retval) { #ifdef _WIN32 - if (errno != WSAEINPROGRESS) { + errno = WSAGetLastError(); + if (errno != WSAEINPROGRESS && errno != WSAEWOULDBLOCK) { closesocket(fd); return -1; }