diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-10 07:48:37 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-10 07:49:55 -0800 |
| commit | fa0a2b4e7c81f57aecc1d94df00588a4dd5c281d (patch) | |
| tree | 31408852501056452a337677c8f5b80fd3c24e7c /lib/mktime.c | |
| parent | 560a384038845e37228226313eccfc8d70132553 (diff) | |
| download | emacs-fa0a2b4e7c81f57aecc1d94df00588a4dd5c281d.tar.gz | |
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.
Diffstat (limited to 'lib/mktime.c')
| -rw-r--r-- | lib/mktime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mktime.c b/lib/mktime.c index b67514996f4..998882f5860 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -153,7 +153,7 @@ isdst_differ (int a, int b) /* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) - (YEAR0-YDAY0 HOUR0:MIN0:SEC0) in seconds, assuming that the clocks - were not adjusted between the time stamps. + were not adjusted between the timestamps. The YEAR values uses the same numbering as TP->tm_year. Values need not be in the usual range. However, YEAR1 must not overflow |