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

Fixed handling of macros and command line /X option for standard predefines.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2635 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
icemank 2003-06-12 16:14:03 +00:00
parent 3b0cc4f1c4
commit 96a02d10ca
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/script.cpp
View file

@ -447,18 +447,26 @@ int CEXEBuild::process_oneline(char *line, char *filename, int linenum)
#ifdef NSIS_SUPPORT_STANDARD_PREDEFINES #ifdef NSIS_SUPPORT_STANDARD_PREDEFINES
// Added by Sunil Kamath 11 June 2003 // Added by Sunil Kamath 11 June 2003
char *oldfilename = set_file_predefine(curfilename); char *oldfilename = NULL;
char *oldtimestamp = set_timestamp_predefine(curfilename); char *oldtimestamp = NULL;
char *oldline = set_line_predefine(linecnt); char *oldline = NULL;
if(lstrcmp(filename,"command line")) { // Don't set the predefines for command line /X option
oldfilename = set_file_predefine(curfilename);
oldtimestamp = set_timestamp_predefine(curfilename);
oldline = set_line_predefine(last_linecnt+linecnt-1); // This is done so that line numbers are
} //handled properly when macros are inserted.
#endif #endif
ps_addtoline(line,linedata,hist); ps_addtoline(line,linedata,hist);
#ifdef NSIS_SUPPORT_STANDARD_PREDEFINES #ifdef NSIS_SUPPORT_STANDARD_PREDEFINES
// Added by Sunil Kamath 11 June 2003 // Added by Sunil Kamath 11 June 2003
restore_file_predefine(oldfilename); if(lstrcmp(filename,"command line")) { // Don't set the predefines for command line /X option
restore_timestamp_predefine(oldtimestamp); restore_file_predefine(oldfilename);
restore_line_predefine(oldline); restore_timestamp_predefine(oldtimestamp);
restore_line_predefine(oldline);
}
#endif #endif
linedata.add((void*)"",1); linedata.add((void*)"",1);