Skip to content

Commit fa2bcf6

Browse files
committed
Merge #789: Avoid non-self-contained Windows header
8023640 qt: Avoid non-self-contained Windows header (Hennadii Stepanov) Pull request description: Using the `windows.h` header guarantees correctness regardless of the content of other headers. For more details, please refer to https://stackoverflow.com/questions/4845198/fatal-error-no-target-architecture-in-visual-studio Fixes the MSVC build when using the upcoming CMake-based build system and Qt packages installed via the vcpkg package manager. Related to hebasto/bitcoin#77. ACKs for top commit: theuni: ACK 8023640. It's not completely clear to me why this currently works, but I don't think it's worth wasting more time on. `windows.h` seems more correct regardless. Tree-SHA512: 1c03f909943111fb2663f86d33ec9a947bc5903819e5bd94f436f6b0782d9f5c5d80d9cd3490674ecd8921b2981c509e97e41580bccc436f8b5c7db84b4e493c
2 parents 6bacd11 + 8023640 commit fa2bcf6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/qt/winshutdownmonitor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <QString>
1111
#include <functional>
1212

13-
#include <windef.h> // for HWND
13+
#include <windows.h>
1414

1515
#include <QAbstractNativeEventFilter>
1616

0 commit comments

Comments
 (0)