diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-31 17:58:13 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-31 17:58:13 +0000 |
| commit | d4c52127946ebd2e6f9952d69d05cac5fe391740 (patch) | |
| tree | 915cfc9328a63d884dffc885cb30cfcf54abf271 | |
| parent | 0f81455429732027fe04118d300c9954bacbcc3c (diff) | |
* strftime.c (rb_strftime): calc timezone offset by myself if system
doesn't provide timezone info.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | strftime.c | 9 |
2 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Mon Sep 1 02:55:15 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * strftime.c (rb_strftime): calc timezone offset by myself if system + doesn't provide timezone info. + Mon Sep 1 02:48:28 2008 Tanaka Akira <akr@fsij.org> * tool/transcode-tblgen.rb: change "illegal" to "invalid". diff --git a/strftime.c b/strftime.c index e559c05dd1..0f5214990f 100644 --- a/strftime.c +++ b/strftime.c @@ -477,6 +477,15 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept #ifdef HAVE_GETTIMEOFDAY gettimeofday(&tv, &zone); off = -zone.tz_minuteswest; +#else + /* no timezone info, then calc by myself */ + { + struct tm utc; + time_t now; + time(&now); + utc = *gmtime(&now); + off = (now - mktime(&utc)) / 60; + } #endif #endif /* !HAVE_TIMEZONE */ #endif /* !HAVE_TM_ZONE */ |