diff options
| author | fanquake <[email protected]> | 2020-08-25 11:09:05 +0800 |
|---|---|---|
| committer | fanquake <[email protected]> | 2020-08-25 11:52:52 +0800 |
| commit | 8e0f341779e1d2754432765ec09deb7488f5b093 (patch) | |
| tree | 76929c861b9bfc0ede3a5b3c90500c0bd6ed6f10 /src | |
| parent | Merge #18405: build: Drop all of the ZeroMQ patches (diff) | |
| parent | Move Win32 defines to configure.ac to ensure they are globally defined (diff) | |
| download | discoin-8e0f341779e1d2754432765ec09deb7488f5b093.tar.xz discoin-8e0f341779e1d2754432765ec09deb7488f5b093.zip | |
Merge #15704: Move Win32 defines to configure.ac to ensure they are globally defined
1ccb9f30c040daf688f89f0d63e9f5e7b131d193 Move Win32 defines to configure.ac to ensure they are globally defined (Luke Dashjr)
Pull request description:
#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 1ccb9f30c040daf688f89f0d63e9f5e7b131d193 - checked that the binaries produced are the same.
Tree-SHA512: 273e9186579197be01b443b6968e26b9a8031d356fabc5b73aa967fcdb837df195b7ce0fc4e4529c85d9b86da6f2d7ff1bf56a3ff0cbbcd8cee8a9c2bf70a244
Diffstat (limited to 'src')
| -rw-r--r-- | src/compat.h | 3 | ||||
| -rw-r--r-- | src/qt/guiutil.cpp | 5 | ||||
| -rw-r--r-- | src/support/lockedpool.cpp | 1 | ||||
| -rw-r--r-- | src/util/system.cpp | 6 |
4 files changed, 0 insertions, 15 deletions
diff --git a/src/compat.h b/src/compat.h index 68f6eb692..0be02cae0 100644 --- a/src/compat.h +++ b/src/compat.h @@ -11,9 +11,6 @@ #endif #ifdef WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif #ifndef NOMINMAX #define NOMINMAX #endif diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 6e34aca0e..bab17562a 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -21,11 +21,6 @@ #include <util/system.h> #ifdef WIN32 -#ifdef _WIN32_IE -#undef _WIN32_IE -#endif -#define _WIN32_IE 0x0501 -#define WIN32_LEAN_AND_MEAN 1 #ifndef NOMINMAX #define NOMINMAX #endif diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp index b4f392116..26de780f2 100644 --- a/src/support/lockedpool.cpp +++ b/src/support/lockedpool.cpp @@ -10,7 +10,6 @@ #endif #ifdef WIN32 -#define WIN32_LEAN_AND_MEAN 1 #ifndef NOMINMAX #define NOMINMAX #endif diff --git a/src/util/system.cpp b/src/util/system.cpp index 7b74789b3..00aa53df7 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -48,12 +48,6 @@ #pragma warning(disable:4717) #endif -#ifdef _WIN32_IE -#undef _WIN32_IE -#endif -#define _WIN32_IE 0x0501 - -#define WIN32_LEAN_AND_MEAN 1 #ifndef NOMINMAX #define NOMINMAX #endif |