usa	2013-04-11 11:22:49 +0900 (Thu, 11 Apr 2013)

  New Revision: 40229

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40229

  Log:
    merge revision(s) 34270: [Backport #5858]
    
    * string.c (rb_str_concat): set array element after definition
      to fix compile error with Fujitsu C Compiler 5.6 on Solaris 10
      on Sparc.  [Bug #5878] [ruby-dev:45123]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/string.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 40228)
+++ ruby_1_9_3/ChangeLog	(revision 40229)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Thu Apr 11 11:22:32 2013  Naohisa Goto  <ngoto@g...>
+
+	* string.c (rb_str_concat): set array element after definition
+	  to fix compile error with Fujitsu C Compiler 5.6 on Solaris 10
+	  on Sparc.  [Bug #5878] [ruby-dev:45123]
+
 Thu Apr 11 11:21:25 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (parser_magic_comment): should pass the proper value.
Index: ruby_1_9_3/string.c
===================================================================
--- ruby_1_9_3/string.c	(revision 40228)
+++ ruby_1_9_3/string.c	(revision 40229)
@@ -2098,7 +2098,8 @@ rb_str_concat(VALUE str1, VALUE str2) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/string.c#L2098
 
     if (enc == rb_usascii_encoding()) {
 	/* US-ASCII automatically extended to ASCII-8BIT */
-	char buf[1] = {(char)code};
+	char buf[1];
+	buf[0] = (char)code;
 	if (code > 0xFF) {
 	    rb_raise(rb_eRangeError, "%u out of char range", code);
 	}
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 40228)
+++ ruby_1_9_3/version.h	(revision 40229)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 413
+#define RUBY_PATCHLEVEL 414
 
 #define RUBY_RELEASE_DATE "2013-04-11"
 #define RUBY_RELEASE_YEAR 2013

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r34270


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/