diff options
| author | Paul Eggert | 2017-01-10 07:48:37 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-01-10 07:49:55 -0800 |
| commit | fa0a2b4e7c81f57aecc1d94df00588a4dd5c281d (patch) | |
| tree | 31408852501056452a337677c8f5b80fd3c24e7c /lib/time.in.h | |
| parent | 560a384038845e37228226313eccfc8d70132553 (diff) | |
| download | emacs-fa0a2b4e7c81f57aecc1d94df00588a4dd5c281d.tar.gz emacs-fa0a2b4e7c81f57aecc1d94df00588a4dd5c281d.zip | |
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/time.in.h')
| -rw-r--r-- | lib/time.in.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/time.in.h b/lib/time.in.h index 3740364b094..fef89807f8a 100644 --- a/lib/time.in.h +++ b/lib/time.in.h | |||
| @@ -217,7 +217,7 @@ _GL_CXXALIAS_SYS (gmtime, struct tm *, (time_t const *__timer)); | |||
| 217 | _GL_CXXALIASWARN (gmtime); | 217 | _GL_CXXALIASWARN (gmtime); |
| 218 | # endif | 218 | # endif |
| 219 | 219 | ||
| 220 | /* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store | 220 | /* Parse BUF as a timestamp, assuming FORMAT specifies its layout, and store |
| 221 | the resulting broken-down time into TM. See | 221 | the resulting broken-down time into TM. See |
| 222 | <http://www.opengroup.org/susv3xsh/strptime.html>. */ | 222 | <http://www.opengroup.org/susv3xsh/strptime.html>. */ |
| 223 | # if @GNULIB_STRPTIME@ | 223 | # if @GNULIB_STRPTIME@ |