Page MenuHomePhabricator
Files F13115429

D7742.diff
No OneTemporary
Actions

D7742.diff
View Options

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -115,8 +115,15 @@
# Build all static so there is no dll file to distribute.
add_linker_flags(-static)
- # Windows 7
- add_compile_definitions(_WIN32_WINNT=0x0601)
+ add_compile_definitions(
+ # Windows 7
+ _WIN32_WINNT=0x0601
+ # Internet Explorer 5.01 (!)
+ _WIN32_IE=0x0501
+ # Define WIN32_LEAN_AND_MEAN to exclude APIs such as Cryptography, DDE,
+ # RPC, Shell, and Windows Sockets.
+ WIN32_LEAN_AND_MEAN
+ )
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/src/compat.h b/src/compat.h
--- 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
--- 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
--- 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
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -49,12 +49,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

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 11:05 (14 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187487
Default Alt Text
D7742.diff (1 KB)

Event Timeline