summaryrefslogtreecommitdiffstats
path: root/src/manifest_parser.cc
diff options
context:
space:
mode:
authorScott Graham <scottmg@chromium.org>2014-11-09 06:49:21 (GMT)
committerScott Graham <scottmg@chromium.org>2014-11-09 06:49:21 (GMT)
commit559389de082406f44ae752a2494e53000d31a7df (patch)
tree3b82939a355ae91662c605b35e739e7f032db6e6 /src/manifest_parser.cc
parent8177085f4d3adf78b9709069a9c3ce5fe442867a (diff)
downloadNinja-559389de082406f44ae752a2494e53000d31a7df.zip
Ninja-559389de082406f44ae752a2494e53000d31a7df.tar.gz
Ninja-559389de082406f44ae752a2494e53000d31a7df.tar.bz2
remove CanonicalizePath overloads, test for toplevel behaviour
Diffstat (limited to 'src/manifest_parser.cc')
-rw-r--r--src/manifest_parser.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/manifest_parser.cc b/src/manifest_parser.cc
index 81a191e..16214f1 100644
--- a/src/manifest_parser.cc
+++ b/src/manifest_parser.cc
@@ -209,7 +209,8 @@ bool ManifestParser::ParseDefault(string* err) {
do {
string path = eval.Evaluate(env_);
string path_err;
- if (!CanonicalizePath(&path, &path_err))
+ unsigned int slash_bits; // Unused because this only does lookup.
+ if (!CanonicalizePath(&path, &path_err, &slash_bits))
return lexer_.Error(path_err, err);
if (!state_->AddDefault(path, &path_err))
return lexer_.Error(path_err, err);