diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-30 14:44:54 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-30 14:44:54 +0000 |
commit | 44320bc32c34ed0b330c647258f623af6d1dd17a (patch) | |
tree | 4e205c67413f5fee8a72d85faee6ed1a2aa1c7c6 | |
parent | 18b17dcd19ddde322b96002cac583e664696ae3a (diff) | |
download | ruby-44320bc32c34ed0b330c647258f623af6d1dd17a.tar.gz |
* time.c (find_time_t): use mktime for the first guess.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24718 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | time.c | 10 |
2 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Sun Aug 30 23:44:09 2009 Tanaka Akira <akr@fsij.org> + + * time.c (find_time_t): use mktime for the first guess. + Sun Aug 30 16:38:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (rb_enc_symname2_p): not depend on nul terminator. @@ -1962,6 +1962,16 @@ find_time_t(struct tm *tptr, int utc_p, time_t *tp) find_dst = 0 < tptr->tm_isdst; +#if defined(HAVE_MKTIME) + tm0 = *tptr; + if (!utc_p && (guess = mktime(&tm0)) != -1) { + tm = GUESS(&guess); + if (tm && tmcmp(tptr, tm) == 0) { + goto found; + } + } +#endif + tm0 = *tptr; if (tm0.tm_mon < 0) { tm0.tm_mon = 0; |