diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2018-04-10 12:20:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-10 12:20:46 (GMT) |
| commit | ca041d88f4d610332aa48c801342edfafb622ccb (patch) | |
| tree | 0fe20b7a9e149bb1acafdb7f53632eb717e1657d /src/disk_interface.cc | |
| parent | 265a6eaf399778c746c7d2c02b8742f3c0ff07e9 (diff) | |
| parent | 49626c3610826a49f5fa7aee139415fe03d650fd (diff) | |
| download | Ninja-ca041d88f4d610332aa48c801342edfafb622ccb.zip Ninja-ca041d88f4d610332aa48c801342edfafb622ccb.tar.gz Ninja-ca041d88f4d610332aa48c801342edfafb622ccb.tar.bz2 | |
Merge pull request #1421 from moroten/revert-for-appveyor-1
Revert "Fix stat when subdirectory is a file"
Diffstat (limited to 'src/disk_interface.cc')
| -rw-r--r-- | src/disk_interface.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/disk_interface.cc b/src/disk_interface.cc index 8334d69..504c679 100644 --- a/src/disk_interface.cc +++ b/src/disk_interface.cc @@ -105,8 +105,7 @@ bool StatAllFilesInDir(const string& dir, map<string, TimeStamp>* stamps, if (find_handle == INVALID_HANDLE_VALUE) { DWORD win_err = GetLastError(); - if (win_err == ERROR_FILE_NOT_FOUND || win_err == ERROR_PATH_NOT_FOUND || - win_err == ERROR_DIRECTORY) // File and not a directory + if (win_err == ERROR_FILE_NOT_FOUND || win_err == ERROR_PATH_NOT_FOUND) return true; *err = "FindFirstFileExA(" + dir + "): " + GetLastErrorString(); return false; |