2000-06-14

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a7a2a3b3..d56c886de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 14 14:50:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (make_time_t): opposite timezone shift (should be negative).
+
 Wed Jun 14 14:07:38 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
 	* io.c: typo(ig/if).
diff --git a/time.c b/time.c
index ad4ca2463..6fd2fee19 100644
--- a/time.c
+++ b/time.c
@@ -314,7 +314,7 @@ make_time_t(tptr, utc_or_local)
     if (!utc_or_local) {	/* localtime zone adjust */
 #if defined(HAVE_TM_ZONE)
 	tm = localtime(&guess);
-	guess += tm->tm_gmtoff;
+	guess -= tm->tm_gmtoff;
 #else
 	struct tm gt, lt;
 	long tzsec;