Merge pull request #966 from diath/msvc_fixes
Silence Windows SDK warnings when building with MSVC
This commit is contained in:
commit
33b60e842f
|
@ -29,7 +29,19 @@
|
|||
#include <winsock2.h>
|
||||
#include <windows.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>
|
||||
|
||||
#endif
|
||||
|
||||
const char *getExceptionName(DWORD exceptionCode)
|
||||
{
|
||||
|
|
|
@ -23,13 +23,21 @@
|
|||
#include "demangle.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
#include <winsock2.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>
|
||||
#pragma warning (pop)
|
||||
|
||||
#else
|
||||
|
||||
#include <cxxabi.h>
|
||||
#include <cstring>
|
||||
#include <cstdlib>
|
||||
|
||||
#endif
|
||||
|
||||
namespace stdext {
|
||||
|
|
Loading…
Reference in New Issue