summaryrefslogtreecommitdiffstats
path: root/src/includes_normalize.h
diff options
context:
space:
mode:
authorJan Niklas Hasse <jhasse@bixense.com>2018-11-08 14:24:49 (GMT)
committerGitHub <noreply@github.com>2018-11-08 14:24:49 (GMT)
commit99c5c2287b11c8bab05fb2a8cf89dc4856c708bc (patch)
treeb26ecbb40b3eef0fb504a55cf65d17d819a4dd5c /src/includes_normalize.h
parent44ed3743af5ac879a53b16d58f05d97fe66a3ea4 (diff)
parentef465615618d0cd129fd3102d904d7151dbaa1f5 (diff)
downloadNinja-99c5c2287b11c8bab05fb2a8cf89dc4856c708bc.zip
Ninja-99c5c2287b11c8bab05fb2a8cf89dc4856c708bc.tar.gz
Ninja-99c5c2287b11c8bab05fb2a8cf89dc4856c708bc.tar.bz2
Merge pull request #1307 from moroten/fix-too-long-path-test-bug
Verify GetFullPathName return value
Diffstat (limited to 'src/includes_normalize.h')
-rw-r--r--src/includes_normalize.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/includes_normalize.h b/src/includes_normalize.h
index 3811e53..0339581 100644
--- a/src/includes_normalize.h
+++ b/src/includes_normalize.h
@@ -25,9 +25,9 @@ struct IncludesNormalize {
IncludesNormalize(const string& relative_to);
// Internal utilities made available for testing, maybe useful otherwise.
- static string AbsPath(StringPiece s);
+ static string AbsPath(StringPiece s, string* err);
static string Relativize(StringPiece path,
- const vector<StringPiece>& start_list);
+ const vector<StringPiece>& start_list, string* err);
/// Normalize by fixing slashes style, fixing redundant .. and . and makes the
/// path |input| relative to |this->relative_to_| and store to |result|.