fixed vc7.1 compile error
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3815 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
c67f89f937
commit
0de534de59
1 changed files with 2 additions and 2 deletions
|
@ -72,7 +72,7 @@ bool dir_reader::matches(const string& name, const string& spec) {
|
||||||
|
|
||||||
default:
|
default:
|
||||||
if (::tolower(*name_itr) != ::tolower(*spec_itr)) {
|
if (::tolower(*name_itr) != ::tolower(*spec_itr)) {
|
||||||
if (last_good_spec) {
|
if (last_good_spec != NULL) {
|
||||||
// matched wrong part of the name, try again
|
// matched wrong part of the name, try again
|
||||||
spec_itr = last_good_spec;
|
spec_itr = last_good_spec;
|
||||||
name_itr = ++last_good_name;
|
name_itr = ++last_good_name;
|
||||||
|
@ -87,7 +87,7 @@ bool dir_reader::matches(const string& name, const string& spec) {
|
||||||
spec_itr++;
|
spec_itr++;
|
||||||
name_itr++;
|
name_itr++;
|
||||||
|
|
||||||
if (spec_itr == spec_end && name_itr != name_end && last_good_spec) {
|
if (spec_itr == spec_end && name_itr != name_end && last_good_spec != NULL) {
|
||||||
// asterisk hasn't matched enough, keep matching
|
// asterisk hasn't matched enough, keep matching
|
||||||
spec_itr = last_good_spec;
|
spec_itr = last_good_spec;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue