Mercurial > vim
diff src/fileio.c @ 25963:aaec2028c8fc v8.2.3515
patch 8.2.3515: nano time test fails on Mac and FreeBSD
Commit: https://github.com/vim/vim/commit/def69dffb3d09a69629b071c89b7893a1783ba53
Author: ichizok <gclient.gaap@gmail.com>
Date: Fri Oct 15 17:23:12 2021 +0100
patch 8.2.3515: nano time test fails on Mac and FreeBSD
Problem: Nano time test fails on Mac and FreeBSD.
Solution: Also check nano time when not on Linux. (Ozaki Kiichi,
closes #9000)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 15 Oct 2021 18:30:05 +0200 |
| parents | d7e1cf30728c |
| children | df2de1e63de0 |
line wrap: on
line diff
--- a/src/fileio.c +++ b/src/fileio.c @@ -3121,18 +3121,19 @@ msg_add_eol(void) int time_differs(stat_T *st, long mtime, long mtime_ns UNUSED) { + return +#ifdef ST_MTIM_NSEC + (long)st->ST_MTIM_NSEC != mtime_ns || +#endif #if defined(__linux__) || defined(MSWIN) - // On a FAT filesystem, esp. under Linux, there are only 5 bits to store - // the seconds. Since the roundoff is done when flushing the inode, the - // time may change unexpectedly by one second!!! - return (long)st->st_mtime - mtime > 1 || mtime - (long)st->st_mtime > 1 -# ifdef ST_MTIM_NSEC - || (long)st->ST_MTIM_NSEC != mtime_ns -# endif - ; + // On a FAT filesystem, esp. under Linux, there are only 5 bits to store + // the seconds. Since the roundoff is done when flushing the inode, the + // time may change unexpectedly by one second!!! + (long)st->st_mtime - mtime > 1 || mtime - (long)st->st_mtime > 1 #else - return (long)st->st_mtime != mtime; + (long)st->st_mtime != mtime #endif + ; } /*