From 99486c73c0a40b9cee59f9525014dcf253089d44 Mon Sep 17 00:00:00 2001 From: svost Date: Sun, 13 Feb 2022 19:18:53 +0300 Subject: [PATCH] Win build: fix noise from compiler, subject to change in future --- src/allocators.h | 5 ++--- src/compat.h | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/allocators.h b/src/allocators.h index c787b35..51bc73e 100644 --- a/src/allocators.h +++ b/src/allocators.h @@ -15,10 +15,9 @@ #include #ifdef WIN32 -#ifdef _WIN32_WINNT -#undef _WIN32_WINNT +#if (_WIN32_WINNT != _WIN32_WINNT_WIN7) +#define _WIN32_WINNT 0x601 #endif -#define _WIN32_WINNT 0x0601 #define WIN32_LEAN_AND_MEAN 1 #ifndef NOMINMAX #define NOMINMAX diff --git a/src/compat.h b/src/compat.h index d0e8114..4df4f4e 100644 --- a/src/compat.h +++ b/src/compat.h @@ -6,7 +6,9 @@ #define _BITCOIN_COMPAT_H 1 #ifdef WIN32 -#define _WIN32_WINNT 0x0601 +#if (_WIN32_WINNT != _WIN_WINNT_WIN7) +#define _WIN32_WINNT 0x601 +#endif #define WIN32_LEAN_AND_MEAN 1 #ifndef NOMINMAX #define NOMINMAX -- 1.7.1