diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2013-07-22 08:05:05 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-07-22 08:05:05 -0700 |
| commit | 6c6255edb54bed780f0879c906dccf6cfa98b4db (patch) | |
| tree | 9aa4643c4fb687f51dd8b737dbe56c5bc0905f21 | |
| parent | ac6561322f661cba6134de1cf6b8bf49b439171f (diff) | |
| parent | b3e0aaf36e294595c606af78feeeef158315a501 (diff) | |
| download | bitcoin-6c6255edb54bed780f0879c906dccf6cfa98b4db.tar.xz | |
Merge pull request #2826 from Diapolo/fix_mingw481
fix invalid conversion error with MinGW 4.8.1 in net.cpp
| -rw-r--r-- | src/net.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/net.cpp b/src/net.cpp index 5418c3de40..bd9aa1f50f 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1598,8 +1598,12 @@ bool BindListenPort(const CService &addrBind, string& strError) // and enable it by default or not. Try to enable it, if possible. if (addrBind.IsIPv6()) { #ifdef IPV6_V6ONLY +#ifdef WIN32 + setsockopt(hListenSocket, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&nOne, sizeof(int)); +#else setsockopt(hListenSocket, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&nOne, sizeof(int)); #endif +#endif #ifdef WIN32 int nProtLevel = 10 /* PROTECTION_LEVEL_UNRESTRICTED */; int nParameterId = 23 /* IPV6_PROTECTION_LEVEl */; |