diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-07 06:42:42 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-07 06:42:42 +0000 |
commit | 35cf08f099a0bd06d84f0167cee3f9bc150f3402 (patch) | |
tree | ff94413ac03aae9e5d7cd0516968c11f812c3c90 /community/domoticz/boost-1.66.patch | |
parent | 036fe643a4bc20304a819438e62594a30fbbf4cd (diff) | |
download | aports-35cf08f099a0bd06d84f0167cee3f9bc150f3402.tar.bz2 aports-35cf08f099a0bd06d84f0167cee3f9bc150f3402.tar.xz |
community/domoticz: fix boost patch
Diffstat (limited to 'community/domoticz/boost-1.66.patch')
-rw-r--r-- | community/domoticz/boost-1.66.patch | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/community/domoticz/boost-1.66.patch b/community/domoticz/boost-1.66.patch index 766ff02009..31993c0c74 100644 --- a/community/domoticz/boost-1.66.patch +++ b/community/domoticz/boost-1.66.patch @@ -9,27 +9,14 @@ Subject: [PATCH] Make compatible with boost 1.66 webserver/server.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/msbuild/domoticz.vcxproj b/msbuild/domoticz.vcxproj -index 5c526ed72..cee958414 100755 ---- a/msbuild/domoticz.vcxproj -+++ b/msbuild/domoticz.vcxproj -@@ -58,7 +58,7 @@ - <PrecompiledHeader>Use</PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> -- <PreprocessorDefinitions>WIN32;ENABLE_PYTHON;_DEBUG;PTW32_STATIC_LIB;WITH_OPENZWAVE;OPENZWAVE_USEDLL;WWW_ENABLE_SSL;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <PreprocessorDefinitions>WIN32;ENABLE_PYTHON;_DEBUG;PTW32_STATIC_LIB;WITH_OPENZWAVE;OPENZWAVE_USEDLL;WWW_ENABLE_SSL;_CONSOLE;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>./Windows Libraries/Boost;./libusb;../MQTT;..\hardware\openzwave;./Windows Libraries/openssl;./Windows Libraries/Curl;./Windows Libraries/pthread;../hardware/plugins/Include;../tinyxpath;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <EnablePREfast>false</EnablePREfast> diff --git a/webserver/proxyclient.cpp b/webserver/proxyclient.cpp index 6bd6b8771..86baef222 100644 --- a/webserver/proxyclient.cpp +++ b/webserver/proxyclient.cpp -@@ -771,7 +771,7 @@ namespace http { +@@ -639,7 +639,7 @@ + void CProxyManager::StartThread() { try { - //boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::tlsv12_client); - boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::sslv23); + boost::asio::ssl::context ctx(boost::asio::ssl::context::sslv23); ctx.set_verify_mode(boost::asio::ssl::verify_none); |