Mercurial > hg > octave-jordi > gnulib-hg
changeset 14032:ff75ce98573c
utimens: simplify the logic of the previous change
* m4/utimes.m4 (gl_FUNC_UTIMES): Simplify the logic a bit.
This should not affect whether the test succeeds or fails.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sat, 25 Dec 2010 14:08:38 -0800 |
| parents | c0f279020352 |
| children | 11d2924ba010 |
| files | ChangeLog m4/utimes.m4 |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-12-25 Paul Eggert <eggert@cs.ucla.edu> + utimens: simplify the logic of the previous change + * m4/utimes.m4 (gl_FUNC_UTIMES): Simplify the logic a bit. + This should not affect whether the test succeeds or fails. + utimens: configure better on hosts with NFS clock skew * m4/utimes.m4 (gl_FUNC_UTIMES): Don't assume that utimes (f, NULL) uses the clock of the local host. It might use the clock of the
--- a/m4/utimes.m4 +++ b/m4/utimes.m4 @@ -96,13 +96,11 @@ result |= 1; else { - int a_ok_POSIX = inorder (t0, st1.st_atime, t2); int m_ok_POSIX = inorder (t0, st1.st_mtime, t2); - int a_ok_NFS = inorder (st0.st_mtime, st1.st_atime, st2.st_mtime); int m_ok_NFS = inorder (st0.st_mtime, st1.st_mtime, st2.st_mtime); - if (! ((a_ok_POSIX || a_ok_NFS) && st1.st_atime == st1.st_mtime)) + if (! (st1.st_atime == st1.st_mtime)) result |= 16; - if (! (a_ok_POSIX ? m_ok_POSIX : m_ok_NFS)) + if (! (m_ok_POSIX || m_ok_NFS)) result |= 32; } if (close (fd) != 0)