From 12b30074e5e6e36f493540073fc43670dbc37f36 Mon Sep 17 00:00:00 2001 From: John Sebastian Peterson Date: Mon, 6 Jul 2015 06:53:48 +0200 Subject: [PATCH 1/2] hike required windows version to vista because xp has faded into the sunset --- Jamfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jamfile b/Jamfile index 100cba093..cd4d3ed16 100755 --- a/Jamfile +++ b/Jamfile @@ -420,8 +420,7 @@ feature.compose production : TORRENT_PRODUCTION_ASSERTS=1 off : TORRENT_USE_ASSERTS=0 ; feature.compose system : TORRENT_USE_SYSTEM_ASSERTS=1 ; -feature windows-version : xp vista win7 : composite propagated link-incompatible ; -feature.compose xp : _WIN32_WINNT=0x0501 ; +feature windows-version : vista win7 : composite propagated link-incompatible ; feature.compose vista : _WIN32_WINNT=0x0600 ; feature.compose win7 : _WIN32_WINNT=0x0601 ; From 5a2dc432b1ee3bab1d47306d84acef4ad32b2f2a Mon Sep 17 00:00:00 2001 From: John Sebastian Peterson Date: Mon, 6 Jul 2015 03:23:51 +0200 Subject: [PATCH 2/2] remove windows version from code file because it should be in the build files --- src/assert.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/assert.cpp b/src/assert.cpp index cf77da4d3..595beb844 100644 --- a/src/assert.cpp +++ b/src/assert.cpp @@ -97,9 +97,6 @@ std::string demangle(char const* name) } #elif defined WIN32 -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 // XP - #include "windows.h" #include "dbghelp.h" @@ -143,9 +140,6 @@ TORRENT_EXPORT void print_backtrace(char* out, int len, int max_depth) // visual studio 9 and up appears to support this #elif defined WIN32 && _MSC_VER >= 1500 -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 // XP - #include "windows.h" #include "libtorrent/utf8.hpp"