diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-27 09:01:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 09:01:48 +0200 |
| commit | 41a320c82719c8201301459338a8eb47752d864d (patch) | |
| tree | c7b7bb54b4d58288e3eda1b78fbfcb7a57bf00a7 | |
| parent | 3031641879aaeddd2465a83f43a309d6cbe0cd52 (diff) | |
| parent | 4d3a18d9ff7db4570fedcc2f89354c41c31b9513 (diff) | |
Merge pull request #38242 from akien-mga/msvc-why-so-moody
Windows: Appease capricious MSVC versions with moody headers
| -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> |