* strftime.c (rb_strftime): return "UTC" instead of "GMT".

* test/ruby/test_time.rb (test_strftime): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

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

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

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(""))