diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-26 22:27:04 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-26 22:27:04 +0200 |
| commit | 4d3a18d9ff7db4570fedcc2f89354c41c31b9513 (patch) | |
| tree | bdaa54bb7758d4d314c0a7f0b7c75831785781cb | |
| parent | 5f645e5d84b73fbf7ff83137d3d0a5f7408c3ba6 (diff) | |
Windows: Appease capricious MSVC versions with moody headers
Fixes #37799.
Fixes #37986.
| -rw-r--r-- | platform/windows/crash_handler_windows.cpp | 4 | ||||
| -rw-r--r-- | thirdparty/basis_universal/basisu_enc.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/platform/windows/crash_handler_windows.cpp b/platform/windows/crash_handler_windows.cpp index 1d9eba22d8..996d9722f5 100644 --- a/platform/windows/crash_handler_windows.cpp +++ b/platform/windows/crash_handler_windows.cpp @@ -38,11 +38,13 @@ // Backtrace code code based on: https://stackoverflow.com/questions/6205981/windows-c-stack-trace-from-a-running-app -#include <psapi.h> #include <algorithm> #include <iterator> +#include <string> #include <vector> +#include <psapi.h> + #pragma comment(lib, "psapi.lib") #pragma comment(lib, "dbghelp.lib") diff --git a/thirdparty/basis_universal/basisu_enc.h b/thirdparty/basis_universal/basisu_enc.h index c2b9133045..0a0c3c6fc0 100644 --- a/thirdparty/basis_universal/basisu_enc.h +++ b/thirdparty/basis_universal/basisu_enc.h @@ -22,6 +22,7 @@ #include <functional> #include <thread> #include <unordered_map> +#include <ostream> #if !defined(_WIN32) || defined(__MINGW32__) #include <libgen.h> |