diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-05-29 11:22:35 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-05-29 11:22:35 -0700 |
| commit | eae130467b737db608b6a3d276048324592fc7c5 (patch) | |
| tree | 0acff0b02a5e9131fde8118b07c7789b20d048a1 | |
| parent | f764cf8d3176b1c46f59ea58b872b2aef835240b (diff) | |
| download | infinitytier-eae130467b737db608b6a3d276048324592fc7c5.tar.gz infinitytier-eae130467b737db608b6a3d276048324592fc7c5.zip | |
Build fix for Windows setsockopt().
| -rw-r--r-- | node/SocketManager.cpp | 8 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/node/SocketManager.cpp b/node/SocketManager.cpp index 076afa07..6f491012 100644 --- a/node/SocketManager.cpp +++ b/node/SocketManager.cpp @@ -245,14 +245,14 @@ SocketManager::SocketManager( int bs = 1048576; while (bs >= 65536) { int tmpbs = bs; - if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,&tmpbs,sizeof(tmpbs)) == 0) + if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0) break; bs -= 16384; } bs = 1048576; while (bs >= 65536) { int tmpbs = bs; - if (setsockopt(s,SOL_SOCKET,SO_SNDBUF,&tmpbs,sizeof(tmpbs)) == 0) + if (setsockopt(s,SOL_SOCKET,SO_SNDBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0) break; bs -= 16384; } @@ -319,14 +319,14 @@ SocketManager::SocketManager( int bs = 1048576; while (bs >= 65536) { int tmpbs = bs; - if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,&tmpbs,sizeof(tmpbs)) == 0) + if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0) break; bs -= 16384; } bs = 1048576; while (bs >= 65536) { int tmpbs = bs; - if (setsockopt(s,SOL_SOCKET,SO_SNDBUF,&tmpbs,sizeof(tmpbs)) == 0) + if (setsockopt(s,SOL_SOCKET,SO_SNDBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0) break; bs -= 16384; } diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index 6b13a0d8..8e41be06 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -244,7 +244,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)\ext\bin\libcrypto\include</AdditionalIncludeDirectories> <PreprocessorDefinitions>ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> + <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet> <StringPooling>true</StringPooling> </ClCompile> <Link> |