highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-02 16:22:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4390

Browse Source 
6dc90ed replace 3 separate calls to WSAGetLastError() with 1 (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan
2014-06-25 07:16:20 +02:00
parent e6cb20e19a 6dc90ed8fa
commit 27383b9015
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/netbase.cpp
View File

@@ -337,8 +337,9 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe
if (connect(hSocket, (struct sockaddr*)&sockaddr, len) == SOCKET_ERROR)
{
int nErr = WSAGetLastError();
// WSAEINVAL is here because some legacy version of winsock uses it
if (WSAGetLastError() == WSAEINPROGRESS || WSAGetLastError() == WSAEWOULDBLOCK || WSAGetLastError() == WSAEINVAL)
if (nErr == WSAEINPROGRESS || nErr == WSAEWOULDBLOCK || nErr == WSAEINVAL)
{
struct timeval timeout;
timeout.tv_sec = nTimeout / 1000;