From eae130467b737db608b6a3d276048324592fc7c5 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Thu, 29 May 2014 11:22:35 -0700
Subject: Build fix for Windows setsockopt().

---
 node/SocketManager.cpp                  | 8 ++++----
 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>
-- 
cgit v1.2.3