git://git.novaco.in
/
novacoin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
edbfc61
)
Win build: fix noise from compiler, subject to change in future
author
svost
<ya.nowa@yandex.ru>
Sun, 13 Feb 2022 16:18:53 +0000 (19:18 +0300)
committer
svost
<ya.nowa@yandex.ru>
Sun, 13 Feb 2022 16:18:53 +0000 (19:18 +0300)
src/allocators.h
patch
|
blob
|
history
src/compat.h
patch
|
blob
|
history
diff --git
a/src/allocators.h
b/src/allocators.h
index
c787b35
..
51bc73e
100644
(file)
--- a/
src/allocators.h
+++ b/
src/allocators.h
@@
-15,10
+15,9
@@
#include <vector>
#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
(file)
--- 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