diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2018-04-05 18:19:05 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 18:19:05 (GMT) |
| commit | e85f5ac86be249e6472b368ee7abbe98fe01bcd2 (patch) | |
| tree | e01bbcc3277a9772c8f2a3f981305f45fb7662d1 /src/includes_normalize-win32.cc | |
| parent | 26341ca0d652b6e50aa57fa176bf610480be5edd (diff) | |
| parent | 59849864592b421e0a8f993011e7e5c2ab27e77b (diff) | |
| download | Ninja-e85f5ac86be249e6472b368ee7abbe98fe01bcd2.zip Ninja-e85f5ac86be249e6472b368ee7abbe98fe01bcd2.tar.gz Ninja-e85f5ac86be249e6472b368ee7abbe98fe01bcd2.tar.bz2 | |
Merge pull request #1348 from ngg/winunicode
Fix building on Windows in UNICODE mode
Diffstat (limited to 'src/includes_normalize-win32.cc')
| -rw-r--r-- | src/includes_normalize-win32.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/includes_normalize-win32.cc b/src/includes_normalize-win32.cc index 459329b..795542b 100644 --- a/src/includes_normalize-win32.cc +++ b/src/includes_normalize-win32.cc @@ -61,8 +61,8 @@ bool SameDrive(StringPiece a, StringPiece b) { char a_absolute[_MAX_PATH]; char b_absolute[_MAX_PATH]; - GetFullPathName(a.AsString().c_str(), sizeof(a_absolute), a_absolute, NULL); - GetFullPathName(b.AsString().c_str(), sizeof(b_absolute), b_absolute, NULL); + GetFullPathNameA(a.AsString().c_str(), sizeof(a_absolute), a_absolute, NULL); + GetFullPathNameA(b.AsString().c_str(), sizeof(b_absolute), b_absolute, NULL); char a_drive[_MAX_DIR]; char b_drive[_MAX_DIR]; _splitpath(a_absolute, a_drive, NULL, NULL, NULL); @@ -122,7 +122,7 @@ string IncludesNormalize::AbsPath(StringPiece s) { } char result[_MAX_PATH]; - GetFullPathName(s.AsString().c_str(), sizeof(result), result, NULL); + GetFullPathNameA(s.AsString().c_str(), sizeof(result), result, NULL); for (char* c = result; *c; ++c) if (*c == '\\') *c = '/'; |