diff options
| author | Paul Eggert | 2019-11-26 13:14:42 -0800 |
|---|---|---|
| committer | Paul Eggert | 2019-11-26 13:15:41 -0800 |
| commit | 1b9dbca826ad8a742ab22719279f5ce3c5888a67 (patch) | |
| tree | afd37873182a84f6708c19105fedca1b4d58ddd2 /lib/time.in.h | |
| parent | 50b52390ee5894e91965bd37f2d0c571df1e2e89 (diff) | |
| download | emacs-1b9dbca826ad8a742ab22719279f5ce3c5888a67.tar.gz emacs-1b9dbca826ad8a742ab22719279f5ce3c5888a67.zip | |
Update from Gnulib
This incorporates:
2019-11-24 Fix errors in C++ mode on mingw
2019-11-24 time_r: Fix for mingw (regression from 2019-11-16)
2019-11-24 sys_time: Fix errors in C++ mode on mingw
2019-11-22 intprops: INT_MULTIPLY_WRAPV speedup for GCC 8.4+
2019-11-21 Disable many _GL_CXXALIASWARN on non-glibc
2019-11-21 Fix various errors in _GL_CXXALIAS_SYS invocations
2019-11-19 intprops: INT_MULTIPLY_WRAPV speedup for GCC 9.3+
2019-11-18 stdint: Define [u]intptr_t correctly on 64-bit native Windows
2019-11-18 stdint: Fix value of WINT_MAX when we override wint_t
2019-11-18 stdint: Avoid "conflicting types" error on mingw 5.22
2019-11-16 time_r: Fix for mingw
2019-11-06 regex: now back in sync with glibc
* lib/intprops.h, lib/regexec.c, lib/signal.in.h:
* lib/stdint.in.h, lib/stdio.in.h, lib/stdlib.in.h:
* lib/string.in.h, lib/sys_select.in.h, lib/sys_time.in.h:
* lib/time.in.h, lib/unistd.in.h, m4/time_r.m4:
Copy from Gnulib.
Diffstat (limited to 'lib/time.in.h')
| -rw-r--r-- | lib/time.in.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/time.in.h b/lib/time.in.h index 40e5b2063fc..1b3bf3ea7ed 100644 --- a/lib/time.in.h +++ b/lib/time.in.h | |||
| @@ -37,6 +37,12 @@ | |||
| 37 | 37 | ||
| 38 | # define _@GUARD_PREFIX@_TIME_H | 38 | # define _@GUARD_PREFIX@_TIME_H |
| 39 | 39 | ||
| 40 | /* mingw's <time.h> provides the functions asctime_r, ctime_r, gmtime_r, | ||
| 41 | localtime_r only if <unistd.h> or <pthread.h> has been included before. */ | ||
| 42 | # if defined __MINGW32__ | ||
| 43 | # include <unistd.h> | ||
| 44 | # endif | ||
| 45 | |||
| 40 | # @INCLUDE_NEXT@ @NEXT_TIME_H@ | 46 | # @INCLUDE_NEXT@ @NEXT_TIME_H@ |
| 41 | 47 | ||
| 42 | /* NetBSD 5.0 mis-defines NULL. */ | 48 | /* NetBSD 5.0 mis-defines NULL. */ |
| @@ -149,7 +155,9 @@ _GL_CXXALIAS_RPL (mktime, time_t, (struct tm *__tp)); | |||
| 149 | # else | 155 | # else |
| 150 | _GL_CXXALIAS_SYS (mktime, time_t, (struct tm *__tp)); | 156 | _GL_CXXALIAS_SYS (mktime, time_t, (struct tm *__tp)); |
| 151 | # endif | 157 | # endif |
| 158 | # if __GLIBC__ >= 2 | ||
| 152 | _GL_CXXALIASWARN (mktime); | 159 | _GL_CXXALIASWARN (mktime); |
| 160 | # endif | ||
| 153 | # endif | 161 | # endif |
| 154 | 162 | ||
| 155 | /* Convert TIMER to RESULT, assuming local time and UTC respectively. See | 163 | /* Convert TIMER to RESULT, assuming local time and UTC respectively. See |
| @@ -217,7 +225,9 @@ _GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer)); | |||
| 217 | # else | 225 | # else |
| 218 | _GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer)); | 226 | _GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer)); |
| 219 | # endif | 227 | # endif |
| 228 | # if __GLIBC__ >= 2 | ||
| 220 | _GL_CXXALIASWARN (localtime); | 229 | _GL_CXXALIASWARN (localtime); |
| 230 | # endif | ||
| 221 | # endif | 231 | # endif |
| 222 | 232 | ||
| 223 | # if 0 || @REPLACE_GMTIME@ | 233 | # if 0 || @REPLACE_GMTIME@ |
| @@ -264,7 +274,9 @@ _GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp)); | |||
| 264 | # else | 274 | # else |
| 265 | _GL_CXXALIAS_SYS (ctime, char *, (time_t const *__tp)); | 275 | _GL_CXXALIAS_SYS (ctime, char *, (time_t const *__tp)); |
| 266 | # endif | 276 | # endif |
| 277 | # if __GLIBC__ >= 2 | ||
| 267 | _GL_CXXALIASWARN (ctime); | 278 | _GL_CXXALIASWARN (ctime); |
| 279 | # endif | ||
| 268 | # endif | 280 | # endif |
| 269 | 281 | ||
| 270 | /* Convert *TP to a date and time string. See | 282 | /* Convert *TP to a date and time string. See |
| @@ -283,7 +295,9 @@ _GL_CXXALIAS_RPL (strftime, size_t, (char *__buf, size_t __bufsize, | |||
| 283 | _GL_CXXALIAS_SYS (strftime, size_t, (char *__buf, size_t __bufsize, | 295 | _GL_CXXALIAS_SYS (strftime, size_t, (char *__buf, size_t __bufsize, |
| 284 | const char *__fmt, const struct tm *__tp)); | 296 | const char *__fmt, const struct tm *__tp)); |
| 285 | # endif | 297 | # endif |
| 298 | # if __GLIBC__ >= 2 | ||
| 286 | _GL_CXXALIASWARN (strftime); | 299 | _GL_CXXALIASWARN (strftime); |
| 300 | # endif | ||
| 287 | # endif | 301 | # endif |
| 288 | 302 | ||
| 289 | # if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@ | 303 | # if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@ |