summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-03-02 04:01:31 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-03-02 04:01:31 +0000
commit5528ebb9f89ec38721640c1fedfc6d8d68e07d0c (patch)
tree14d9f9d4b56c05f52a1b55a56de3e029233a9573
parent7aa6f86a1f31ccbd83d3409126f692ef439ce922 (diff)
downloadruby-5528ebb9f89ec38721640c1fedfc6d8d68e07d0c.tar.gz
ruby-5528ebb9f89ec38721640c1fedfc6d8d68e07d0c.tar.xz
ruby-5528ebb9f89ec38721640c1fedfc6d8d68e07d0c.zip
* win32/win32.c (filetime_to_unixtime): should set tm_isdst to -1.
stat() didn't treat daylight saving time property on WinNT. [ruby-talk:182100] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--win32/win32.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 848a4fa7c..331758bb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 2 12:59:14 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * win32/win32.c (filetime_to_unixtime): should set tm_isdst to -1.
+ stat() didn't treat daylight saving time property on WinNT.
+ [ruby-talk:182100]
+
Thu Mar 2 08:02:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* gc.c (add_heap): heap_slots may overflow. a patch from Stefan
diff --git a/win32/win32.c b/win32/win32.c
index f51e93e30..b817cdf4e 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2879,6 +2879,7 @@ filetime_to_unixtime(const FILETIME *ft)
tm.tm_hour = st.wHour;
tm.tm_min = st.wMinute;
tm.tm_sec = st.wSecond;
+ tm.tm_isdst = -1;
t = mktime(&tm);
return t == -1 ? 0 : t;
}