nagachika	2014-10-15 23:47:38 +0900 (Wed, 15 Oct 2014)

  New Revision: 47952

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

  Log:
    merge revision(s) r45715: [Backport #10265]
    
    * configure.in: NetBSD's ksh, used by configure, needs escapes.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 47951)
+++ ruby_2_1/configure.in	(revision 47952)
@@ -2092,7 +2092,7 @@ if test x$setjmp_prefix = xsig; then https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2092
 else
     unset setjmp_sigmask
 fi
-AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+($setjmp_cast)})
+AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cast\)})
 AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask+,0})])
 AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp($setjmp_cast(env),val)])
 AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47951)
+++ ruby_2_1/ChangeLog	(revision 47952)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Oct 15 23:25:24 2014  NARUSE, Yui  <naruse@r...>
+
+	* configure.in: NetBSD's ksh, used by configure, needs escapes.
+
 Wed Oct 15 23:13:43 2014  Eric Wong  <e@8...>
 
 	* array.c (ary_recycle_hash): add RB_GC_GUARD
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47951)
+++ ruby_2_1/version.h	(revision 47952)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.4"
 #define RUBY_RELEASE_DATE "2014-10-15"
-#define RUBY_PATCHLEVEL 252
+#define RUBY_PATCHLEVEL 253
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 10

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45715


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