Merge branch 'upstream-KWSys' into update-kwsys

* upstream-KWSys:
  KWSys 2016-08-24 (8e643b9b)
This commit is contained in:
Brad King 2016-08-24 10:55:19 -04:00
commit 7bc6dccc0a
1 changed files with 5 additions and 2 deletions

View File

@ -4725,8 +4725,11 @@ bool SystemTools::GetShortPath(const std::string& path, std::string& shortPath)
std::wstring wtempPath = Encoding::ToWide(tempPath); std::wstring wtempPath = Encoding::ToWide(tempPath);
DWORD ret = GetShortPathNameW(wtempPath.c_str(), NULL, 0); DWORD ret = GetShortPathNameW(wtempPath.c_str(), NULL, 0);
std::vector<wchar_t> buffer(ret); std::vector<wchar_t> buffer(ret);
ret = GetShortPathNameW(wtempPath.c_str(), if (ret != 0)
&buffer[0], static_cast<DWORD>(buffer.size())); {
ret = GetShortPathNameW(wtempPath.c_str(),
&buffer[0], static_cast<DWORD>(buffer.size()));
}
if (ret == 0) if (ret == 0)
{ {