diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:07:11 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:07:11 +0000 |
| commit | 3703150d56ff6ee557ab330e55637c9c23835902 (patch) | |
| tree | b3f13dd5416c38c508ee785dd3e543e381cc03a2 /src/net.cpp | |
| parent | 1bc2f0a37b68aa99e90437105a48c47046b6c0d0 (diff) | |
| parent | ca39829ecb90e392b9722292739585124ba0d7c1 (diff) | |
| download | bitcoin-3703150d56ff6ee557ab330e55637c9c23835902.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
doc/release-process.txt
src/serialize.h
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net.cpp b/src/net.cpp index ebdc1cc149..8384251095 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -914,7 +914,7 @@ void ThreadSocketHandler2(void* parg) if (nSelect == SOCKET_ERROR) { int nErr = WSAGetLastError(); - if (hSocketMax > -1) + if (hSocketMax != INVALID_SOCKET) { printf("socket select error %d\n", nErr); for (unsigned int i = 0; i <= hSocketMax; i++) |