git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR libstdc++/88749 fix build failure in src/filesystem/ops.cc 

PR libstdc++/88749
	* src/filesystem/ops.cc (last_write_time): Fix preprocessor condition
	to match the one that controls whether utimbuf and utime are declared.

From-SVN: r267705
This commit is contained in:
Jonathan Wakely 2019-01-08 10:18:54 +00:00 committed by Jonathan Wakely
parent 1d005accea
commit 35724e5154
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2019-01-08 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/88749
* src/filesystem/ops.cc (last_write_time): Fix preprocessor condition
to match the one that controls whether utimbuf and utime are declared.
2019-01-07 Jonathan Wakely <jwakely@redhat.com> 2019-01-07 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/87787 PR libstdc++/87787

4
libstdc++-v3/src/filesystem/ops.cc
View File

@ -41,7 +41,7 @@
# include <fcntl.h> // AT_FDCWD, AT_SYMLINK_NOFOLLOW # include <fcntl.h> // AT_FDCWD, AT_SYMLINK_NOFOLLOW
#endif #endif
#ifdef _GLIBCXX_HAVE_SYS_STAT_H #ifdef _GLIBCXX_HAVE_SYS_STAT_H
# include <sys/stat.h> // stat, utimensat, fchmodat # include <sys/stat.h> // stat, utimensat, fchmodat
#endif #endif
#ifdef _GLIBCXX_HAVE_SYS_STATVFS_H #ifdef _GLIBCXX_HAVE_SYS_STATVFS_H
# include <sys/statvfs.h> // statvfs # include <sys/statvfs.h> // statvfs
@ -909,7 +909,7 @@ fs::last_write_time(const path& p __attribute__((__unused__)),
ec.assign(errno, std::generic_category()); ec.assign(errno, std::generic_category());
else else
ec.clear(); ec.clear();
#elif _GLIBCXX_HAVE_UTIME_H #elif _GLIBCXX_USE_UTIME && _GLIBCXX_HAVE_SYS_STAT_H
posix::utimbuf times; posix::utimbuf times;
times.modtime = s.count(); times.modtime = s.count();
times.actime = do_stat(p, ec, [](const auto& st) { return st.st_atime; }, times.actime = do_stat(p, ec, [](const auto& st) { return st.st_atime; },