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
commit03a7a33b0d5d6ebdac69f700f8ddaad79e18658b (patch)
tree9b8af4b82bcd7b883ed1caa583b10324430c0917
parent9591086aa3e523067fa809f4551de3340bcc16c2 (diff)
downloadruby-03a7a33b0d5d6ebdac69f700f8ddaad79e18658b.tar.gz
ruby-03a7a33b0d5d6ebdac69f700f8ddaad79e18658b.tar.xz
ruby-03a7a33b0d5d6ebdac69f700f8ddaad79e18658b.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/trunk@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 3f0b1530a..369adc733 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 2 12:55:16 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]
+
Wed Mar 1 00:15:51 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/rdoc/parsers/parse_rb.rb (read_escape): could not handle /\^/.
diff --git a/win32/win32.c b/win32/win32.c
index 3494461f3..9e448564f 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3223,6 +3223,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;
}