diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2024-01-26 20:31:51 +0000 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2024-01-26 20:40:46 +0000 |
| commit | fa2bcf627b8866031cd62d0a2d3ced57b17442a8 (patch) | |
| tree | cb5878c0009b8b5b92b4986c9bc4187603f462ec | |
| parent | 6bacd11b09390353d75606d738b2fcbccffcb2b2 (diff) | |
| parent | 8023640a71a10ec54a6a8e6b95a29d07f7be218d (diff) | |
Merge bitcoin-core/gui#789: Avoid non-self-contained Windows header
8023640a71a10ec54a6a8e6b95a29d07f7be218d 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 https://github.com/hebasto/bitcoin/pull/77.
ACKs for top commit:
theuni:
ACK 8023640a71a10ec54a6a8e6b95a29d07f7be218d. 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
| -rw-r--r-- | src/qt/winshutdownmonitor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/winshutdownmonitor.h b/src/qt/winshutdownmonitor.h index 78f287637f..060d8546e3 100644 --- a/src/qt/winshutdownmonitor.h +++ b/src/qt/winshutdownmonitor.h @@ -10,7 +10,7 @@ #include <QString> #include <functional> -#include <windef.h> // for HWND +#include <windows.h> #include <QAbstractNativeEventFilter> |