diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2017-08-21 14:59:17 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2020-08-20 17:55:06 +0000 |
| commit | 1ccb9f30c040daf688f89f0d63e9f5e7b131d193 (patch) | |
| tree | 73b4f95461bf51ca05018d2a823fe437bd7c5172 /src | |
| parent | e9b30126545d6ddd8772363e4079d1e4908ad117 (diff) | |
| download | bitcoin-1ccb9f30c040daf688f89f0d63e9f5e7b131d193.tar.xz | |
Move Win32 defines to configure.ac to ensure they are globally defined
common.vcxproj used for MSVC builds
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 68f6eb692c..0be02cae03 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 6e34aca0eb..bab17562a6 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 b4f392116c..26de780f29 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 7b74789b32..00aa53df70 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 |