diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-03-11 08:03:50 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-03-11 08:03:50 +0000 |
| commit | f9eaa686aa8ed00b222834d75a57af6a0feab158 (patch) | |
| tree | cf4dbbdea870f332e5c634cd19b4f0dd2a419506 /sysutils/freefilesync/files/patch-zen_file__access.cpp | |
| parent | mainsysutils/freefilesync: unbreak build on 10.x (diff) | |
sysutils/freefilesync: back out r207879 to fix INDEX bustage
PR: 207879
Notes
Notes:
svn path=/head/; revision=410811
Diffstat (limited to 'sysutils/freefilesync/files/patch-zen_file__access.cpp')
| -rw-r--r-- | sysutils/freefilesync/files/patch-zen_file__access.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/sysutils/freefilesync/files/patch-zen_file__access.cpp b/sysutils/freefilesync/files/patch-zen_file__access.cpp deleted file mode 100644 index 385996b71b9d..000000000000 --- a/sysutils/freefilesync/files/patch-zen_file__access.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- ../../zen/file_access.cpp.orig 2016-01-11 12:13:10 UTC -+++ ../../zen/file_access.cpp -@@ -877,6 +877,11 @@ void setFileTimeRaw(const Zstring& fileP - //https://sourceforge.net/p/freefilesync/discussion/open-discussion/thread/218564cf/ - newTimes[1] = modTime; //modification time - -+#if defined(__FreeBSD__) -+#include <osreldate.h> -+#if __FreeBSD_version < 1002506 || (__FreeBSD_version >= 1100000 && __FreeBSD_version < 1100056) -+ throw ErrorLinuxFallbackToUtimes(L""); -+#else - //=> using open()/futimens() for regular files and utimensat(AT_SYMLINK_NOFOLLOW) for symlinks is consistent with "cp" and "touch"! - if (procSl == ProcSymlink::FOLLOW) - { -@@ -898,6 +903,8 @@ void setFileTimeRaw(const Zstring& fileP - if (::utimensat(AT_FDCWD, filePath.c_str(), newTimes, AT_SYMLINK_NOFOLLOW) != 0) - THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot write modification time of %x."), L"%x", fmtPath(filePath)), L"utimensat"); - } -+#endif -+#endif - } - - |