Merge pull request #2826 from Diapolo/fix_mingw481

fix invalid conversion error with MinGW 4.8.1 in net.cpp
bitcoin · Jul 22, 2013 · 6c6255e · 6c6255e
2 parents ac65613 + b3e0aaf
commit 6c6255e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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 */;