From 5ad205b81dff6a2fd9804d06bd52f06d8102b952 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 19 Jul 2018 11:22:03 +0000 Subject: [PATCH] renamed ruby_tz_update as ruby_tz_uptodate_p git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63997 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- hash.c | 6 +++--- time.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hash.c b/hash.c index 1b3fde2de2..48fbe1f37c 100644 --- a/hash.c +++ b/hash.c @@ -3316,7 +3316,7 @@ env_str_new2(const char *ptr) static int env_path_tainted(const char *); static const char TZ_ENV[] = "TZ"; -extern int ruby_tz_update; +extern bool ruby_tz_uptodate_p; static rb_encoding * env_encoding_for(const char *name, const char *ptr) @@ -3400,7 +3400,7 @@ env_delete(VALUE obj, VALUE name) path_tainted = 0; } else if (ENVMATCH(nam, TZ_ENV)) { - ruby_tz_update = 0; + ruby_tz_uptodate_p = FALSE; } return value; } @@ -3762,7 +3762,7 @@ env_aset(VALUE obj, VALUE nm, VALUE val) } } else if (ENVMATCH(name, TZ_ENV)) { - ruby_tz_update = 0; + ruby_tz_uptodate_p = FALSE; } return val; } diff --git a/time.c b/time.c index b49db04172..f56d37f9b6 100644 --- a/time.c +++ b/time.c @@ -647,7 +647,7 @@ static struct vtm *localtimew(wideval_t timew, struct vtm *result); static int leap_year_p(long y); #define leap_year_v_p(y) leap_year_p(NUM2LONG(modv((y), INT2FIX(400)))) -int ruby_tz_update; +bool ruby_tz_uptodate_p; static struct tm * rb_localtime_r(const time_t *t, struct tm *result) @@ -655,8 +655,8 @@ rb_localtime_r(const time_t *t, struct tm *result) #if defined __APPLE__ && defined __LP64__ if (*t != (time_t)(int)*t) return NULL; #endif - if (!ruby_tz_update) { - ruby_tz_update = 1; + if (!ruby_tz_uptodate_p) { + ruby_tz_uptodate_p = 1; tzset(); } #ifdef HAVE_GMTIME_R