1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* time.c (LOCALTIME): organize #ifdefs.

Browse Source 
* time.c (GMTIME): define only ifndef HAVE_STRUCT_TM_TM_GMTOFF.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-03-18 19:06:33 +00:00
parent 9a8b21446e
commit 4eb908d21a
2 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Mar 19 03:57:13 2016 NARUSE, Yui <naruse@ruby-lang.org>
* time.c (LOCALTIME): organize #ifdefs.
* time.c (GMTIME): define only ifndef HAVE_STRUCT_TM_TM_GMTOFF.
Sat Mar 19 03:53:31 2016 NARUSE, Yui <naruse@ruby-lang.org> Sat Mar 19 03:53:31 2016 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in (rb_cv_member_struct_tm_tm_gmtoff): For Linux (glibc) * configure.in (rb_cv_member_struct_tm_tm_gmtoff): For Linux (glibc)

58
time.c
View File

@ -783,45 +783,29 @@ static struct vtm *localtimew(wideval_t timew, struct vtm *result);
static int leap_year_p(long y); static int leap_year_p(long y);
#define leap_year_v_p(y) leap_year_p(NUM2LONG(mod((y), INT2FIX(400)))) #define leap_year_v_p(y) leap_year_p(NUM2LONG(mod((y), INT2FIX(400))))
#ifdef HAVE_GMTIME_R
#define rb_gmtime_r(t, tm) gmtime_r((t), (tm))
#define rb_localtime_r(t, tm) localtime_r((t), (tm))
#else
static inline struct tm *
rb_gmtime_r(const time_t *tp, struct tm *result)
{
struct tm *t = gmtime(tp);
if (t) *result = *t;
return t;
}
static inline struct tm *
rb_localtime_r(const time_t *tp, struct tm *result)
{
struct tm *t = localtime(tp);
if (t) *result = *t;
return t;
}
#endif
static struct tm * static struct tm *
rb_localtime_r2(const time_t *t, struct tm *result) rb_localtime_r(const time_t *t, struct tm *result)
{ {
#if defined __APPLE__ && defined __LP64__ #if defined __APPLE__ && defined __LP64__
if (*t != (time_t)(int)*t) return NULL; if (*t != (time_t)(int)*t) return NULL;
#endif #endif
result = rb_localtime_r(t, result); #ifdef HAVE_GMTIME_R
result = localtime_r(t, result);
#else
{
struct tm *tmp = localtime(t);
if (tmp) *result = *tmp;
}
#endif
#if defined(HAVE_MKTIME) && defined(LOCALTIME_OVERFLOW_PROBLEM) #if defined(HAVE_MKTIME) && defined(LOCALTIME_OVERFLOW_PROBLEM)
if (result) { if (result) {
long gmtoff1 = 0; long gmtoff1 = 0;
long gmtoff2 = 0; long gmtoff2 = 0;
struct tm tmp = *result; struct tm tmp = *result;
time_t t2; time_t t2;
# if defined(HAVE_STRUCT_TM_TM_GMTOFF)
gmtoff1 = result->tm_gmtoff;
# endif
t2 = mktime(&tmp); t2 = mktime(&tmp);
# if defined(HAVE_STRUCT_TM_TM_GMTOFF) # if defined(HAVE_STRUCT_TM_TM_GMTOFF)
gmtoff1 = result->tm_gmtoff;
gmtoff2 = tmp.tm_gmtoff; gmtoff2 = tmp.tm_gmtoff;
# endif # endif
if (*t + gmtoff1 != t2 + gmtoff2) if (*t + gmtoff1 != t2 + gmtoff2)
@ -830,24 +814,26 @@ rb_localtime_r2(const time_t *t, struct tm *result)
#endif #endif
return result; return result;
} }
#define LOCALTIME(tm, result) (tzset(),rb_localtime_r2((tm), &(result))) #define LOCALTIME(tm, result) (tzset(),rb_localtime_r((tm), &(result)))
#if !defined(HAVE_STRUCT_TM_TM_GMTOFF) #ifndef HAVE_STRUCT_TM_TM_GMTOFF
static struct tm * static struct tm *
rb_gmtime_r2(const time_t *t, struct tm *result) rb_gmtime_r(const time_t *t, struct tm *result)
{ {
result = rb_gmtime_r(t, result); #ifdef HAVE_GMTIME_R
result = gmtime_r(t, result);
#else
struct tm *tmp = gmtime(t);
if (tmp) *result = *tmp;
#endif
#if defined(HAVE_TIMEGM) && defined(LOCALTIME_OVERFLOW_PROBLEM) #if defined(HAVE_TIMEGM) && defined(LOCALTIME_OVERFLOW_PROBLEM)
if (result) { if (result && *t != timegm(result)) {
struct tm tmp = *result; return NULL;
time_t t2 = timegm(&tmp);
if (*t != t2)
result = NULL;
} }
#endif #endif
return result; return result;
} }
# define GMTIME(tm, result) rb_gmtime_r2((tm), &(result)) # define GMTIME(tm, result) rb_gmtime_r((tm), &(result))
#endif #endif
static const int common_year_yday_offset[] = { static const int common_year_yday_offset[] = {