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

fixed build errors and warnings caused by latest merge

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4233 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-08-30 16:30:48 +00:00
parent 57ad3c18b3
commit 8424e074e9
5 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/script.cpp
View file

@ -5413,10 +5413,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
{
SCRIPT_MSG("PluginDir: \"%s\"\n",line.gettoken_str(1));
#ifdef _WIN32
m_plugins.FindCommands(line.gettoken_str(1), display_info);
m_plugins.FindCommands(line.gettoken_str(1), display_info?true:false);
#else
char *converted_path = my_convert(line.gettoken_str(1));
m_plugins.FindCommands(converted_path, display_info);
m_plugins.FindCommands(converted_path, display_info?true:false);
my_convert_free(converted_path);
#endif
return PS_OK;
@ -5429,7 +5429,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
const string command = m_plugins.NormalizedCommand(line.gettoken_str(0));
const string dllPath = m_plugins.GetPluginPath(command);
int data_handle = m_plugins.GetPluginHandle(uninstall_mode, command);
int data_handle = m_plugins.GetPluginHandle(uninstall_mode?true:false, command);
if (uninstall_mode) uninst_plugin_used = true;
else plugin_used = true;
@ -5461,7 +5461,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
if (ret != PS_OK) {
return ret;
}
m_plugins.SetDllDataHandle(uninstall_mode, line.gettoken_str(0), data_handle);
m_plugins.SetDllDataHandle(uninstall_mode?true:false, line.gettoken_str(0), data_handle);
build_overwrite=old_build_overwrite;
build_datesave=old_build_datesave;
// Added by ramon 23 May 2003