From fa0a2b4e7c81f57aecc1d94df00588a4dd5c281d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 10 Jan 2017 07:48:37 -0800 Subject: Merge from gnulib This incorporates: 2017-01-09 maint: time stamp -> timestamp 2017-01-07 stdioext: Port to Minix 3.2 and newer 2017-01-06 glob, intprops, xalloc: work around Clang bug 2017-01-02 revert copyright-year change to synced files * doc/misc/texinfo.tex, lib/fpending.c, lib/intprops.h, lib/mktime.c: * lib/stat-time.h, lib/stdio-impl.h, lib/time.in.h, lib/timespec.h: * lib/utimens.c, lib/xalloc-oversized.h: Copy from gnulib. --- lib/timespec.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/timespec.h') diff --git a/lib/timespec.h b/lib/timespec.h index fc7b3d115b7..a5eca797ce3 100644 --- a/lib/timespec.h +++ b/lib/timespec.h @@ -29,7 +29,7 @@ _GL_INLINE_HEADER_BEGIN # define _GL_TIMESPEC_INLINE _GL_INLINE #endif -/* Resolution of timespec time stamps (in units per second), and log +/* Resolution of timespec timestamps (in units per second), and log base 10 of the resolution. */ enum { TIMESPEC_RESOLUTION = 1000000000 }; @@ -48,7 +48,7 @@ make_timespec (time_t s, long int ns) /* Return negative, zero, positive if A < B, A == B, A > B, respectively. - For each time stamp T, this code assumes that either: + For each timestamp T, this code assumes that either: * T.tv_nsec is in the range 0..999999999; or * T.tv_sec corresponds to a valid leap second on a host that supports @@ -56,7 +56,7 @@ make_timespec (time_t s, long int ns) * T.tv_sec is the minimum time_t value and T.tv_nsec is -1; or T.tv_sec is the maximum time_t value and T.tv_nsec is 2000000000. This allows for special struct timespec values that are less or - greater than all possible valid time stamps. + greater than all possible valid timestamps. In all these cases, it is safe to subtract two tv_nsec values and convert the result to integer without worrying about overflow on -- cgit v1.2.1