summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-22 09:47:35 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-22 09:47:35 +0000
commit083d726b86ca35553cc3e8439b9cd3d9cd645586 (patch)
treed9728f1349f441e66fc3bed4660e20fb0bb04461 /time.c
parent0cc6f32d322e9ca1eb5b60b4ab95e6bb3f1f18dd (diff)
merges r22053 from trunk into ruby_1_9_1.
* time.c (LOCALTIME): should call tzset() before localtime_r(). [ruby-dev:37896] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/time.c b/time.c
index 88425cb2b7..fe70b2d12f 100644
--- a/time.c
+++ b/time.c
@@ -487,7 +487,7 @@ static VALUE time_get_tm(VALUE, int);
#define IF_HAVE_GMTIME_R(x) x
#define ASCTIME(tm, buf) asctime_r(tm, buf)
#define GMTIME(tm, result) gmtime_r(tm, &result)
-#define LOCALTIME(tm, result) localtime_r(tm, &result)
+#define LOCALTIME(tm, result) (tzset(),localtime_r(tm, &result))
#else
#define IF_HAVE_GMTIME_R(x) /* nothing */
#define ASCTIME(tm, buf) asctime(tm)