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

* TOK_PLUGINDIR path can't be const because of PATH_CONVERT(path) on POSIX

Browse source 
* Remove truncate_cast usage from fileform.c


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6613 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-09-19 14:07:14 +00:00
parent e81728a52b
commit 6d534850e7
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/exehead/fileform.c
View file

@ -17,10 +17,6 @@
*/
#include "../Platform.h"
#if defined(__cplusplus) && defined(truncate_cast)
#undef BUGBUG64TRUNCATE
#define BUGBUG64TRUNCATE truncate_cast
#endif
#include "fileform.h"
#include "util.h"
#include "state.h"

3
Source/script.cpp
View file

@ -6094,7 +6094,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
{
CEXEBuild::TARGETTYPE tt = m_target_type;
int numtok = line.getnumtokens() - 1;
const TCHAR *path = line.gettoken_str(numtok), *cmdnam = get_commandtoken_name(which_token), *arcstr = 0;
TCHAR *path = line.gettoken_str(numtok);
const TCHAR *cmdnam = get_commandtoken_name(which_token), *arcstr = 0;
if (2 == numtok)
{
arcstr = line.gettoken_str(--numtok);