diff options
Diffstat (limited to 'src/common/Debugging')
| -rw-r--r-- | src/common/Debugging/WheatyExceptionReport.cpp | 26 | ||||
| -rw-r--r-- | src/common/Debugging/WheatyExceptionReport.h | 7 |
2 files changed, 8 insertions, 25 deletions
diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index c95d5fd4d3b..74ea5b003d4 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -3,30 +3,16 @@ // MSDN Magazine, 2002 // FILE: WheatyExceptionReport.CPP //========================================== -#include "CompilerDefs.h" - -#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS && !defined(__MINGW32__) -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#pragma warning(disable:4996) -#pragma warning(disable:4312) -#pragma warning(disable:4311) -#include <windows.h> -#include <tlhelp32.h> -#include <cstdio> -#include <tchar.h> -#define _NO_CVCONST_H -#include <dbghelp.h> - #include "WheatyExceptionReport.h" - #include "Common.h" #include "Errors.h" #include "GitRevision.h" #include <algorithm> #include <ehdata.h> #include <rttidata.h> +#include <cstdio> +#include <tlhelp32.h> +#include <tchar.h> #define CrashFolder _T("Crashes") #pragma comment(linker, "/DEFAULTLIB:dbghelp.lib") @@ -434,14 +420,14 @@ void WheatyExceptionReport::PrintSystemInfo() ::GlobalMemoryStatus(&MemoryStatus); TCHAR sString[1024]; Log(_T("//=====================================================\r\n")); - if (_GetProcessorName(sString, countof(sString))) + if (_GetProcessorName(sString, std::size(sString))) Log(_T("*** Hardware ***\r\nProcessor: %s\r\nNumber Of Processors: %d\r\nPhysical Memory: %d KB (Available: %d KB)\r\nCommit Charge Limit: %d KB\r\n"), sString, SystemInfo.dwNumberOfProcessors, MemoryStatus.dwTotalPhys/0x400, MemoryStatus.dwAvailPhys/0x400, MemoryStatus.dwTotalPageFile/0x400); else Log(_T("*** Hardware ***\r\nProcessor: <unknown>\r\nNumber Of Processors: %d\r\nPhysical Memory: %d KB (Available: %d KB)\r\nCommit Charge Limit: %d KB\r\n"), SystemInfo.dwNumberOfProcessors, MemoryStatus.dwTotalPhys/0x400, MemoryStatus.dwAvailPhys/0x400, MemoryStatus.dwTotalPageFile/0x400); - if (_GetWindowsVersion(sString, countof(sString))) + if (_GetWindowsVersion(sString, std::size(sString))) Log(_T("\r\n*** Operation System ***\r\n%s\r\n"), sString); else Log(_T("\r\n*** Operation System:\r\n<unknown>\r\n")); @@ -1585,5 +1571,3 @@ std::string SymbolDetail::ToString() } return formatted; } - -#endif // _WIN32 diff --git a/src/common/Debugging/WheatyExceptionReport.h b/src/common/Debugging/WheatyExceptionReport.h index a3cb4b2f04c..912a98c198a 100644 --- a/src/common/Debugging/WheatyExceptionReport.h +++ b/src/common/Debugging/WheatyExceptionReport.h @@ -1,16 +1,16 @@ #ifndef _WHEATYEXCEPTIONREPORT_ #define _WHEATYEXCEPTIONREPORT_ -#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS && !defined(__MINGW32__) +#define _NO_CVCONST_H +#include <windows.h> #include <winnt.h> #include <winternl.h> #include <dbghelp.h> #include <set> -#include <stdlib.h> +#include <cstdlib> #include <stack> #include <mutex> -#define countof _countof #define WER_MAX_ARRAY_ELEMENTS_COUNT 10 #define WER_MAX_NESTING_LEVEL 4 @@ -200,5 +200,4 @@ class WheatyExceptionReport }; extern WheatyExceptionReport g_WheatyExceptionReport; // global instance of class -#endif // _WIN32 #endif // _WHEATYEXCEPTIONREPORT_ |