fixed compile error under gcc-2.95
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3787 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
6d438d0f34
commit
444221504c
2 changed files with 2 additions and 2 deletions
|
@ -148,7 +148,7 @@ class CEXEBuild {
|
||||||
int do_add_file(const char *lgss, int attrib, int recurse, int *total_files, const char
|
int do_add_file(const char *lgss, int attrib, int recurse, int *total_files, const char
|
||||||
*name_override=0, int generatecode=1, int *data_handle=0,
|
*name_override=0, int generatecode=1, int *data_handle=0,
|
||||||
const std::set<std::string>& excluded=std::set<std::string>(),
|
const std::set<std::string>& excluded=std::set<std::string>(),
|
||||||
std::string& basedir=std::string(""));
|
const std::string& basedir=std::string(""));
|
||||||
int add_file(const std::string& dir, const std::string& file, int attrib, const char
|
int add_file(const std::string& dir, const std::string& file, int attrib, const char
|
||||||
*name_override, int generatecode, int *data_handle);
|
*name_override, int generatecode, int *data_handle);
|
||||||
int do_add_file_create_dir(const std::string& local_dir, const std::string& dir, int attrib=0);
|
int do_add_file_create_dir(const std::string& local_dir, const std::string& dir, int attrib=0);
|
||||||
|
|
|
@ -5600,7 +5600,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef NSIS_SUPPORT_FILE
|
#ifdef NSIS_SUPPORT_FILE
|
||||||
int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int *total_files, const char *name_override, int generatecode, int *data_handle, const set<string>& excluded, string& basedir)
|
int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int *total_files, const char *name_override, int generatecode, int *data_handle, const set<string>& excluded, const string& basedir)
|
||||||
{
|
{
|
||||||
assert(!name_override || !recurse);
|
assert(!name_override || !recurse);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue