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.

diff --git a/ChangeLog b/ChangeLog
index 18cd30ecf8f575c2afdc39e35d0e542f3e29c939..02ff64386529458b9a4340855eae2dd415b63758 100644 (file)
--- 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

diff --git a/m4/utimes.m4 b/m4/utimes.m4
index 81865cb5a285107f577e7f6c7096658b4c10e695..4a41541936835638105e1d0d36693ce97145badc 100644 (file)
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -96,13 +96,11 @@ main ()
           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)