Skip to content

Commit feb6363

Browse files
fanquakePastaPastaPasta
authored andcommitted
Merge bitcoin#15704: Move Win32 defines to configure.ac to ensure they are globally defined
1ccb9f3 Move Win32 defines to configure.ac to ensure they are globally defined (Luke Dashjr) Pull request description: bitcoin#9245 no longer needs this, since the main `_WIN32_WINNT` got bumped by something else. So rather than just lose it, might as well get it merged in independently. I'm not aware of any practical effects, but it seems safer to use the same API versions everywhere. ACKs for top commit: fanquake: ACK 1ccb9f3 - checked that the binaries produced are the same. Tree-SHA512: 273e9186579197be01b443b6968e26b9a8031d356fabc5b73aa967fcdb837df195b7ce0fc4e4529c85d9b86da6f2d7ff1bf56a3ff0cbbcd8cee8a9c2bf70a244
1 parent c95bbed commit feb6363

File tree

5 files changed

+1
-16
lines changed

5 files changed

+1
-16
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ case $host in
691691
AC_MSG_ERROR("windres not found")
692692
fi
693693

694-
CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -D_WIN32_WINNT=0x0601"
694+
CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -DWIN32_LEAN_AND_MEAN"
695695

696696
dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.
697697
dnl That breaks our ability to build dll's with static libgcc/libstdc++/libssp. Override

src/compat.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
#endif
1212

1313
#ifdef WIN32
14-
#ifndef WIN32_LEAN_AND_MEAN
15-
#define WIN32_LEAN_AND_MEAN 1
16-
#endif
1714
#ifndef NOMINMAX
1815
#define NOMINMAX
1916
#endif

src/qt/guiutil.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
#include <cmath>
2828

2929
#ifdef WIN32
30-
#ifdef _WIN32_IE
31-
#undef _WIN32_IE
32-
#endif
33-
#define _WIN32_IE 0x0501
34-
#define WIN32_LEAN_AND_MEAN 1
3530
#ifndef NOMINMAX
3631
#define NOMINMAX
3732
#endif

src/support/lockedpool.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#endif
1111

1212
#ifdef WIN32
13-
#define WIN32_LEAN_AND_MEAN 1
1413
#ifndef NOMINMAX
1514
#define NOMINMAX
1615
#endif

src/util/system.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@
5252
#pragma warning(disable:4717)
5353
#endif
5454

55-
#ifdef _WIN32_IE
56-
#undef _WIN32_IE
57-
#endif
58-
#define _WIN32_IE 0x0501
59-
60-
#define WIN32_LEAN_AND_MEAN 1
6155
#ifndef NOMINMAX
6256
#define NOMINMAX
6357
#endif

0 commit comments

Comments
 (0)