Merge from coreutils.

diff --git a/lib/timespec.h b/lib/timespec.h
index 8633461..2c32a23 100644 (file)
--- a/lib/timespec.h
+++ b/lib/timespec.h
@@ -1,6 +1,6 @@
 /* timespec -- System time interface
 
-   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -43,6 +43,17 @@ struct timespec
 # endif
 
 # ifdef ST_MTIM_NSEC
+#  define ST_TIME_CMP_NS(a, b, ns) ((a).ns < (b).ns ? -1 : (a).ns > (b).ns)
+# else
+#  define ST_TIME_CMP_NS(a, b, ns) 0
+# endif
+# define ST_TIME_CMP(a, b, s, ns) \
+   ((a).s < (b).s ? -1 : (a).s > (b).s ? 1 : ST_TIME_CMP_NS(a, b, ns))
+# define ATIME_CMP(a, b) ST_TIME_CMP (a, b, st_atime, st_atim.ST_MTIM_NSEC)
+# define CTIME_CMP(a, b) ST_TIME_CMP (a, b, st_ctime, st_ctim.ST_MTIM_NSEC)
+# define MTIME_CMP(a, b) ST_TIME_CMP (a, b, st_mtime, st_mtim.ST_MTIM_NSEC)
+
+# ifdef ST_MTIM_NSEC
 #  define TIMESPEC_NS(timespec) ((timespec).ST_MTIM_NSEC)
 # else
 #  define TIMESPEC_NS(timespec) 0