From 5123850db075b69272700b32314dc9b04e0b43b3 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 28 Mar 2021 13:34:57 +0100 Subject: Fix Windows XP to 7 compatibility (#5167) * Partially reverts 01a4e696b * Unify thread names - Remove use of GetThreadId API --- src/Globals.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/Globals.h') diff --git a/src/Globals.h b/src/Globals.h index 0a5607c2f..d5af4fa11 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -78,22 +78,24 @@ // OS-dependent stuff: #ifdef _WIN32 - + #define NOMINMAX // Windows SDK defines min and max macros, messing up with our std::min and std::max usage. #define WIN32_LEAN_AND_MEAN - #define _WIN32_WINNT _WIN32_WINNT_WS03 // We want to target Windows XP with Service Pack 2 & Windows Server 2003 with Service Pack 1 and higher + #define _WIN32_WINNT 0x0501 // We want to target Windows XP with Service Pack 2 & Windows Server 2003 with Service Pack 1 and higher. - // Windows SDK defines min and max macros, messing up with our std::min and std::max usage - #define NOMINMAX + // Use CryptoAPI primitives when targeting a version that supports encrypting with AES-CFB8 smaller than a full block at a time. + #define PLATFORM_CRYPTOGRAPHY (_WIN32_WINNT >= 0x0602) #include #include #include // IPv6 stuff - // Windows SDK defines GetFreeSpace as a constant, probably a Win16 API remnant + // Windows SDK defines GetFreeSpace as a constant, probably a Win16 API remnant: #ifdef GetFreeSpace #undef GetFreeSpace #endif // GetFreeSpace #else + #define PLATFORM_CRYPTOGRAPHY 0 + #include #include #endif -- cgit v1.2.3