From 2109057119781a3e8ed266836c95f98eded2038c Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 6 Jun 2021 17:15:33 +0100 Subject: Windows: do not include sdkddkver before defining WIN32_WINNT Including that header before defining the macro defaults the SDK to the latest version, not what we want. --- src/Globals.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Globals.h b/src/Globals.h index 8da8c14c8..dc0bdc3ae 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -78,14 +78,12 @@ // OS-dependent stuff: #ifdef _WIN32 - #include - #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_WINXP // 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. // 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 >= _WIN32_WINNT_WIN8) + #define PLATFORM_CRYPTOGRAPHY (_WIN32_WINNT >= 0x0602) #include #include -- cgit v1.2.3