mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00
Code Activity

Use non-deprecated HAVE_STRUCT_TM_TM_ZONE

Browse source 
* libguile/stime.c: Change uses of the deprecated HAVE_TM_ZONE to the
  new HAVE_STRUCT_TM_TM_ZONE.
This commit is contained in:
Andy Wingo 2016-07-23 14:07:11 +02:00
parent 1f14900a07
commit 315acd5ee0
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libguile/stime.c
View file

@ -408,7 +408,7 @@ SCM_DEFINE (scm_localtime, "localtime", 1, 1, 0,
const char *ptr; const char *ptr;
/* copy zone name before calling gmtime or restoring zone. */ /* copy zone name before calling gmtime or restoring zone. */
#if defined (HAVE_TM_ZONE) #if defined (HAVE_STRUCT_TM_TM_ZONE)
ptr = ltptr->tm_zone; ptr = ltptr->tm_zone;
#elif defined (HAVE_TZNAME) #elif defined (HAVE_TZNAME)
ptr = tzname[ (ltptr->tm_isdst == 1) ? 1 : 0 ]; ptr = tzname[ (ltptr->tm_isdst == 1) ? 1 : 0 ];
@ -517,7 +517,7 @@ bdtime2c (SCM sbd_time, struct tm *lt, int pos, const char *subr)
#if HAVE_STRUCT_TM_TM_GMTOFF #if HAVE_STRUCT_TM_TM_GMTOFF
lt->tm_gmtoff = - scm_to_int (SCM_SIMPLE_VECTOR_REF (sbd_time, 9)); lt->tm_gmtoff = - scm_to_int (SCM_SIMPLE_VECTOR_REF (sbd_time, 9));
#endif #endif
#ifdef HAVE_TM_ZONE #ifdef HAVE_STRUCT_TM_TM_ZONE
if (scm_is_false (SCM_SIMPLE_VECTOR_REF (sbd_time, 10))) if (scm_is_false (SCM_SIMPLE_VECTOR_REF (sbd_time, 10)))
lt->tm_zone = NULL; lt->tm_zone = NULL;
else else
@ -568,7 +568,7 @@ SCM_DEFINE (scm_mktime, "mktime", 1, 1, 0,
const char *ptr; const char *ptr;
/* copy zone name before calling gmtime or restoring the zone. */ /* copy zone name before calling gmtime or restoring the zone. */
#if defined (HAVE_TM_ZONE) #if defined (HAVE_STRUCT_TM_TM_ZONE)
ptr = lt.tm_zone; ptr = lt.tm_zone;
#elif defined (HAVE_TZNAME) #elif defined (HAVE_TZNAME)
ptr = tzname[ (lt.tm_isdst == 1) ? 1 : 0 ]; ptr = tzname[ (lt.tm_isdst == 1) ? 1 : 0 ];
@ -678,7 +678,7 @@ SCM_DEFINE (scm_strftime, "strftime", 2, 0, 0,
tbuf = scm_malloc (size); tbuf = scm_malloc (size);
{ {
#if !defined (HAVE_TM_ZONE) #if !defined (HAVE_STRUCT_TM_TM_ZONE)
/* it seems the only way to tell non-GNU versions of strftime what /* it seems the only way to tell non-GNU versions of strftime what
zone to use (for the %Z format) is to set TZ in the zone to use (for the %Z format) is to set TZ in the
environment. interrupts and thread switching must be deferred environment. interrupts and thread switching must be deferred
@ -716,7 +716,7 @@ SCM_DEFINE (scm_strftime, "strftime", 2, 0, 0,
tbuf = scm_malloc (size); tbuf = scm_malloc (size);
} }
#if !defined (HAVE_TM_ZONE) #if !defined (HAVE_STRUCT_TM_TM_ZONE)
if (have_zone) if (have_zone)
{ {
restorezone (zone_spec, oldenv, FUNC_NAME); restorezone (zone_spec, oldenv, FUNC_NAME);