Merge pull request #966 from diath/msvc_fixes

Silence Windows SDK warnings when building with MSVC
master
Konrad Kuśnierz 5 years ago committed by GitHub
commit 33b60e842f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -29,8 +29,20 @@
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <process.h> #include <process.h>
#ifdef _MSC_VER
#pragma warning (push)
#pragma warning (disable:4091) // warning C4091: 'typedef ': ignored on left of '' when no variable is declared
#include <imagehlp.h>
#pragma warning (pop)
#else
#include <imagehlp.h> #include <imagehlp.h>
#endif
const char *getExceptionName(DWORD exceptionCode) const char *getExceptionName(DWORD exceptionCode)
{ {
switch (exceptionCode) { switch (exceptionCode) {

@ -23,13 +23,21 @@
#include "demangle.h" #include "demangle.h"
#ifdef _MSC_VER #ifdef _MSC_VER
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#pragma warning (push)
#pragma warning (disable:4091) // warning C4091: 'typedef ': ignored on left of '' when no variable is declared
#include <dbghelp.h> #include <dbghelp.h>
#pragma warning (pop)
#else #else
#include <cxxabi.h> #include <cxxabi.h>
#include <cstring> #include <cstring>
#include <cstdlib> #include <cstdlib>
#endif #endif
namespace stdext { namespace stdext {

Loading…
Cancel
Save