diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2017-01-24 19:03:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 19:03:50 (GMT) |
| commit | 2993752dd617ada5218836dd6545fb06690e238b (patch) | |
| tree | 574e0fcacc7f65345cd9a99c471a06c411e94db0 /src/graph.cc | |
| parent | 9e71431e6f8323be8ced8997409cfe7a389c6583 (diff) | |
| parent | 1cc730ddc27df52d757be1c2e7aa96193f8ca9df (diff) | |
| download | Ninja-2993752dd617ada5218836dd6545fb06690e238b.zip Ninja-2993752dd617ada5218836dd6545fb06690e238b.tar.gz Ninja-2993752dd617ada5218836dd6545fb06690e238b.tar.bz2 | |
Merge pull request #1181 from DanielWeber/issue-1161
Allow more path components
Diffstat (limited to 'src/graph.cc')
| -rw-r--r-- | src/graph.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/graph.cc b/src/graph.cc index 136ca04..b4c8619 100644 --- a/src/graph.cc +++ b/src/graph.cc @@ -348,10 +348,10 @@ bool Edge::use_console() const { } // static -string Node::PathDecanonicalized(const string& path, unsigned int slash_bits) { +string Node::PathDecanonicalized(const string& path, uint64_t slash_bits) { string result = path; #ifdef _WIN32 - unsigned int mask = 1; + uint64_t mask = 1; for (char* c = &result[0]; (c = strchr(c, '/')) != NULL;) { if (slash_bits & mask) *c = '\\'; @@ -420,7 +420,7 @@ bool ImplicitDepLoader::LoadDepFile(Edge* edge, const string& path, return false; } - unsigned int unused; + uint64_t unused; if (!CanonicalizePath(const_cast<char*>(depfile.out_.str_), &depfile.out_.len_, &unused, err)) { *err = path + ": " + *err; @@ -444,7 +444,7 @@ bool ImplicitDepLoader::LoadDepFile(Edge* edge, const string& path, // Add all its in-edges. for (vector<StringPiece>::iterator i = depfile.ins_.begin(); i != depfile.ins_.end(); ++i, ++implicit_dep) { - unsigned int slash_bits; + uint64_t slash_bits; if (!CanonicalizePath(const_cast<char*>(i->str_), &i->len_, &slash_bits, err)) return false; |