dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

VS2008 does not like the vsnwprintf(INT_MAX) hack, use _vscwprintf if it exists

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6396 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-07-25 22:00:53 +00:00
parent 19b9a3e65a
commit 6c60c09a2c
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/util.cpp
View file

@ -48,6 +48,7 @@ namespace Apple { // defines struct section
#include <cassert> // for assert
#include <algorithm>
#include <stdexcept>
#include <errno.h>
using namespace std;
@ -577,10 +578,14 @@ tstring lowercase(const tstring &str) {
size_t ExpandoStrFmtVaList(wchar_t*Stack, size_t cchStack, wchar_t**ppMalloc, const wchar_t*FmtStr, va_list Args)
{
#ifdef _WIN32
// For _vsnwprintf, the \0 terminator is not part of the size
#define ExpandoStrFmtVaList_vsnwprintf(d,c,f,v) _vsnwprintf((d),(c)?(c)-1:0,(f),(v))
// For _vsnwprintf, the \0 terminator is not part of the input size
# if _MSC_VER <= 1310
# define ExpandoStrFmtVaList_vsnwprintf(d,c,f,v) _vsnwprintf((d),(c)?(c)-1:0,(f),(v)) // Allow INT_MAX hack on MinGW and older versions of VC that don't have _vscwprintf
# else
# define ExpandoStrFmtVaList_vsnwprintf(d,c,f,v) ( INT_MAX==(c) ? _vscwprintf((f),(v)) : _vsnwprintf((d),(c)?(c)-1:0,(f),(v)) )
# endif
#else
#define ExpandoStrFmtVaList_vsnwprintf vswprintf
# define ExpandoStrFmtVaList_vsnwprintf vswprintf
#endif
#if defined(_ISOC99_SOURCE) || _POSIX_C_SOURCE >= 200112L
const bool cansizecalc = true, msvcbackdoor = false;