summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-02 02:22:19 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-02 02:22:19 +0000
commit21b3c77441d87706524a71390e87bb61920bd556 (patch)
tree4cee0ea9e0bf0e1b76eb6fe041bb15680bf011c3
parentc17eaba05778ac55d546363534b4a4be74dd6530 (diff)
* time.c (time_asctime): workaround for MSVCRT's bug.
backported from trunk (r18871). ref [ruby-core:26992] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@25973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--time.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9bdc84b02d..637230e491 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 2 11:21:10 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * time.c (time_asctime): workaround for MSVCRT's bug.
+ backported from trunk (r18871). ref [ruby-core:26992]
+
Tue Dec 1 18:00:12 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/digest/test_digest_extend.rb: added tests for digest framework.
diff --git a/time.c b/time.c
index 6fe5326dda..4cc16e88f3 100644
--- a/time.c
+++ b/time.c
@@ -1242,6 +1242,10 @@ time_asctime(time)
}
s = asctime(&tobj->tm);
if (s[24] == '\n') s[24] = '\0';
+#if (defined(_MSC_VER) && defined(_DLL)) || defined(__MSVCRT__)
+ /* workaround for MSVCRT's bug */
+ if (s[8] == '0') s[8] = ' ';
+#endif
return rb_str_new2(s);
}