diff options
| author | Wladimir J. van der Laan <[email protected]> | 2011-08-11 10:17:21 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2011-08-11 10:17:21 +0200 |
| commit | 0a76546ae973241259aa5019e0d27758f86ef891 (patch) | |
| tree | 2b2fd48e1a1c18cf4f2d8fb6ad8ccec812779532 /src/net.cpp | |
| parent | QtUI code cleanup / comment improvements (diff) | |
| parent | Merge pull request #459 from jgarzik/char-msgstart (diff) | |
| download | discoin-0a76546ae973241259aa5019e0d27758f86ef891.tar.xz discoin-0a76546ae973241259aa5019e0d27758f86ef891.zip | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/net.cpp b/src/net.cpp index d69778821..b52af24a5 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -98,7 +98,7 @@ bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet, int nTimeout SOCKET hSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (hSocket == INVALID_SOCKET) return false; -#ifdef BSD +#ifdef SO_NOSIGPIPE int set = 1; setsockopt(hSocket, SOL_SOCKET, SO_NOSIGPIPE, (void*)&set, sizeof(int)); #endif @@ -1143,6 +1143,11 @@ void MapPort(bool fMapPort) printf("Error: ThreadMapPort(ThreadMapPort) failed\n"); } } +#else +void MapPort(bool /* unused fMapPort */) +{ + // Intentionally left blank. +} #endif @@ -1579,7 +1584,7 @@ bool BindListenPort(string& strError) return false; } -#ifdef BSD +#ifdef SO_NOSIGPIPE // Different way of disabling SIGPIPE on BSD setsockopt(hListenSocket, SOL_SOCKET, SO_NOSIGPIPE, (void*)&nOne, sizeof(int)); #endif |