summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--strftime.c2
-rw-r--r--test/ruby/test_time.rb2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fc53f20d66..434dbbb985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug 21 09:29:01 2008 Shugo Maeda <shugo@ruby-lang.org>
+
+ * strftime.c (rb_strftime): return "UTC" instead of "GMT".
+
+ * test/ruby/test_time.rb (test_strftime): ditto.
+
Thu Aug 21 07:59:04 2008 NARUSE, Yui <naruse@ruby-lang.org>
* test/iconv/test_option.rb (test_ignore_option): skip if iconv
diff --git a/strftime.c b/strftime.c
index 86284191c2..28c9527140 100644
--- a/strftime.c
+++ b/strftime.c
@@ -446,7 +446,7 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept
case 'Z': /* time zone name or abbrevation */
if (gmt) {
- strcpy(tbuf, "GMT");
+ strcpy(tbuf, "UTC");
break;
}
#ifdef HAVE_TZNAME
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index 049693037d..a84cbd9ec6 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -371,7 +371,7 @@ class TestTime < Test::Unit::TestCase
assert_equal("00:00:00", T2000.strftime("%X"))
assert_equal("00", T2000.strftime("%y"))
assert_equal("2000", T2000.strftime("%Y"))
- assert(["GMT", "UTC"].include?(T2000.strftime("%Z")))
+ assert_equal("UTC", T2000.strftime("%Z"))
assert_equal("%", T2000.strftime("%%"))
assert_equal("", T2000.strftime(""))