# HG changeset patch # User Kai T. Ohlhus # Date 1572260584 -32400 # Node ID f90564fb99e0134293415fab35d5407b741e18ad # Parent d0fe6e344c4134a334b8a71593f1d19f9beca247# Parent 3b50efa29be46182d29020729bd83c253e930a95 maint: merge stable to default. diff -r d0fe6e344c41 -r f90564fb99e0 libinterp/corefcn/sysdep.cc --- a/libinterp/corefcn/sysdep.cc Sun Oct 27 14:19:34 2019 -0700 +++ b/libinterp/corefcn/sysdep.cc Mon Oct 28 20:03:04 2019 +0900 @@ -270,6 +270,9 @@ { #if defined (OCTAVE_USE_WINDOWS_API) + // FIXME: When Octave switches to C++17, consider replacing this function + // by https://en.cppreference.com/w/cpp/filesystem/equivalent. + bool retval = false; std::wstring file1w = sys::u8_to_wstring (file1); @@ -305,7 +308,13 @@ { retval = (hfi1.dwVolumeSerialNumber == hfi2.dwVolumeSerialNumber && hfi1.nFileIndexHigh == hfi2.nFileIndexHigh - && hfi1.nFileIndexLow == hfi2.nFileIndexLow); + && hfi1.nFileIndexLow == hfi2.nFileIndexLow + && hfi1.nFileSizeHigh == hfi2.nFileSizeHigh + && hfi1.nFileSizeLow == hfi2.nFileSizeLow + && hfi1.ftLastWriteTime.dwLowDateTime + == hfi2.ftLastWriteTime.dwLowDateTime + && hfi1.ftLastWriteTime.dwHighDateTime + == hfi2.ftLastWriteTime.dwHighDateTime); } CloseHandle (hfile2);