Fixed all VS2015 warnings except C4577 ('noexcept' used with no exception handling mode specified)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6627 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
b54c831ff0
commit
1c1d1d5e12
12 changed files with 124 additions and 31 deletions
|
@ -1,6 +1,13 @@
|
|||
|
||||
#include "../../Source/Platform.h"
|
||||
#undef _tcsrchr // The fix for bug #1085 causes a MSVC redefinition warning when <tchar.h> is included by zlib/unzip.h -> zlib/ioapi.h.
|
||||
|
||||
// Platform.h includes our custom tchar.h and
|
||||
// VS2015 does not like this because we are about to pull in its tchar.h.
|
||||
// As a temporary workaround we just undefine the things it disagrees with:
|
||||
#undef _vstprintf
|
||||
#undef _tcstok
|
||||
|
||||
#include <windows.h>
|
||||
#include <tchar.h>
|
||||
#include <stdio.h>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue