diff options
| author | B. Stack <bgstack15@gmail.com> | 2024-11-04 19:38:28 -0500 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2024-11-04 19:38:28 -0500 |
| commit | b39324e4de8f546989f5b5e1505be1ce1b0970e5 (patch) | |
| tree | c5286be1e921ba2e64462cc0eee61b95bc89a083 /zen | |
| parent | add upstream 13.7 (diff) | |
| download | FreeFileSync-b39324e4de8f546989f5b5e1505be1ce1b0970e5.tar.gz FreeFileSync-b39324e4de8f546989f5b5e1505be1ce1b0970e5.tar.bz2 FreeFileSync-b39324e4de8f546989f5b5e1505be1ce1b0970e5.zip | |
Diffstat (limited to 'zen')
| -rw-r--r-- | zen/dir_watcher.cpp | 2 | ||||
| -rw-r--r-- | zen/file_access.cpp | 2 | ||||
| -rw-r--r-- | zen/legacy_compiler.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/zen/dir_watcher.cpp b/zen/dir_watcher.cpp index 471d5438..1b7b0ec4 100644 --- a/zen/dir_watcher.cpp +++ b/zen/dir_watcher.cpp @@ -9,7 +9,7 @@ //#include <set> #include "thread.h" #include "scope_guard.h" - #include "file_access.h" +#include "file_access.h" #include <map> #include <sys/inotify.h> diff --git a/zen/file_access.cpp b/zen/file_access.cpp index 23b6f70d..e1b2860e 100644 --- a/zen/file_access.cpp +++ b/zen/file_access.cpp @@ -374,7 +374,7 @@ void setWriteTimeNative(const Zstring& itemPath, const timespec& modTime, ProcSy //hell knows why files on gvfs-mounted Samba shares fail to open(O_WRONLY) returning EOPNOTSUPP: //https://freefilesync.org/forum/viewtopic.php?t=2803 => utimensat() works (but not for gvfs SFTP) - if (::utimensat(AT_FDCWD, itemPath.c_str(), newTimes, procSl == ProcSymlink::asLink ? AT_SYMLINK_NOFOLLOW : 0) == 0) + if (::utimensat(AT_FDCWD /*'dirfd' ignored for absolute paths*/, itemPath.c_str(), newTimes, procSl == ProcSymlink::asLink ? AT_SYMLINK_NOFOLLOW : 0) == 0) return; const ErrorCode ecUtimensat = errno; try diff --git a/zen/legacy_compiler.h b/zen/legacy_compiler.h index 6d208b09..09ac5dae 100644 --- a/zen/legacy_compiler.h +++ b/zen/legacy_compiler.h @@ -29,6 +29,7 @@ namespace std { + //W(hy)TF is this not standard? https://stackoverflow.com/a/47735624 template <class Char, class Traits, class Alloc> inline basic_string<Char, Traits, Alloc> operator+(basic_string<Char, Traits, Alloc>&& lhs, const basic_string_view<Char> rhs) |