Bladeren bron

Windows: Appease capricious MSVC versions with moody headers

Fixes #37799.
Fixes #37986.
Rémi Verschelde 5 jaren geleden
bovenliggende
commit
4d3a18d9ff
2 gewijzigde bestanden met toevoegingen van 4 en 1 verwijderingen
  1. 3 1
      platform/windows/crash_handler_windows.cpp
  2. 1 0
      thirdparty/basis_universal/basisu_enc.h

+ 3 - 1
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
 // Backtrace code code based on: https://stackoverflow.com/questions/6205981/windows-c-stack-trace-from-a-running-app
 
 
-#include <psapi.h>
 #include <algorithm>
 #include <algorithm>
 #include <iterator>
 #include <iterator>
+#include <string>
 #include <vector>
 #include <vector>
 
 
+#include <psapi.h>
+
 #pragma comment(lib, "psapi.lib")
 #pragma comment(lib, "psapi.lib")
 #pragma comment(lib, "dbghelp.lib")
 #pragma comment(lib, "dbghelp.lib")
 
 

+ 1 - 0
thirdparty/basis_universal/basisu_enc.h

@@ -22,6 +22,7 @@
 #include <functional>
 #include <functional>
 #include <thread>
 #include <thread>
 #include <unordered_map>
 #include <unordered_map>
+#include <ostream>
 
 
 #if !defined(_WIN32) || defined(__MINGW32__)
 #if !defined(_WIN32) || defined(__MINGW32__)
 #include <libgen.h>
 #include <libgen.h>