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

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 492fabfadc..839c063fb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb  5 03:55:22 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (LOCALTIME): should call tzset() before localtime_r().
+	  [ruby-dev:37896]
+
 Wed Feb  4 11:45:06 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/mkexports.rb: shouldn't export DllMain.
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)