diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2018-04-05 01:08:03 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 01:08:03 (GMT) |
| commit | 6bcdc7bfd1ec8dd91f5a5e90d529b22210722f51 (patch) | |
| tree | 793450a629f64a546dbc25b688957cab1d14d020 /src | |
| parent | f67e6fb6f6987aed019722edde3e1f04d272e5b7 (diff) | |
| parent | 1952afa56177d006077447477a237ad4e98270d5 (diff) | |
| download | Ninja-6bcdc7bfd1ec8dd91f5a5e90d529b22210722f51.zip Ninja-6bcdc7bfd1ec8dd91f5a5e90d529b22210722f51.tar.gz Ninja-6bcdc7bfd1ec8dd91f5a5e90d529b22210722f51.tar.bz2 | |
Merge pull request #1392 from alekseyshl/master
Fix build on Solaris.
Diffstat (limited to 'src')
| -rw-r--r-- | src/disk_interface.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/disk_interface.cc b/src/disk_interface.cc index 4b4c4c7..aceb575 100644 --- a/src/disk_interface.cc +++ b/src/disk_interface.cc @@ -195,11 +195,12 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL + st.st_mtimespec.tv_nsec); #elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ - defined(__BIONIC__)) + defined(__BIONIC__) || (defined (__SVR4) && defined (__sun))) // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above. // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar // For bionic, C and POSIX API is always enabled. + // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec; #else return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; |