procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix time-related data types in 2 editfns.c functions

Browse source 
* src/editfns.c (format_time_string, Fcurrent_time_zone): Pass a
pointer to 'time_t' value to 'emacs_localtime_rz' and 'gmtime_r',
instead of relying on struct timespec's 'tv_sec' member to be of
compatible type.
This commit is contained in:
Eli Zaretskii 2016-10-17 10:19:34 +03:00
parent 665ee0a565
commit be0c3814af
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/editfns.c
View file

@ -2085,7 +2085,11 @@ format_time_string (char const *format, ptrdiff_t formatlen,
USE_SAFE_ALLOCA;
timezone_t tz = tzlookup (zone, false);
tmp = emacs_localtime_rz (tz, &t.tv_sec, tmp);
/* On some systems, like 32-bit MinGW, tv_sec of struct timespec is
a 64-bit type, but time_t is a 32-bit type. emacs_localtime_rz
expects a pointer to time_t value. */
time_t tsec = t.tv_sec;
tmp = emacs_localtime_rz (tz, &tsec, tmp);
if (! tmp)
{
xtzfree (tz);
@ -2353,7 +2357,10 @@ the data it can't find. */)
zone_name = format_time_string ("%Z", sizeof "%Z" - 1, value,
zone, &local_tm);
if (HAVE_TM_GMTOFF || gmtime_r (&value.tv_sec, &gmt_tm))
/* gmtime_r expects a pointer to time_t, but tv_sec of struct
timespec on some systems (MinGW) is a 64-bit field. */
time_t tsec = value.tv_sec;
if (HAVE_TM_GMTOFF || gmtime_r (&tsec, &gmt_tm))
{
long int offset = (HAVE_TM_GMTOFF
? tm_gmtoff (&local_tm)