Преглед на файлове

Merge pull request #38242 from akien-mga/msvc-why-so-moody

Windows: Appease capricious MSVC versions with moody headers
Rémi Verschelde преди 5 години
родител
ревизия
41a320c827
променени са 2 файла, в които са добавени 4 реда и са изтрити 1 реда
  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
 
-#include <psapi.h>
 #include <algorithm>
 #include <iterator>
+#include <string>
 #include <vector>
 
+#include <psapi.h>
+
 #pragma comment(lib, "psapi.lib")
 #pragma comment(lib, "dbghelp.lib")
 

+ 1 - 0
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>