gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #966 from diath/msvc_fixes 

Silence Windows SDK warnings when building with MSVC
This commit is contained in:
Konrad Kuśnierz 2019-01-16 13:57:30 +01:00 committed by GitHub
parent 70a95b2f04 1bd392aba9
commit 33b60e842f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/framework/platform/win32crashhandler.cpp
View File

@ -29,7 +29,19 @@
#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> #include <imagehlp.h>
#pragma warning (pop)
#else
#include <imagehlp.h>
#endif
const char *getExceptionName(DWORD exceptionCode) const char *getExceptionName(DWORD exceptionCode)
{ {

8
src/framework/stdext/demangle.cpp
View File

@ -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 {