naruse	2015-01-19 11:59:36 +0900 (Mon, 19 Jan 2015)

  New Revision: 49328

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

  Log:
    merge revision(s) 49192: [Backport #10716]
    
    * configure.in (RUBY_SETJMP_TYPE): Remove superfluous semicolon
      which causes a syntax error with autoconf 2.63.
      [ruby-core:67429] [Bug #10716]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/configure.in
    branches/ruby_2_2/version.h
Index: ruby_2_2/configure.in
===================================================================
--- ruby_2_2/configure.in	(revision 49327)
+++ ruby_2_2/configure.in	(revision 49328)
@@ -2306,7 +2306,7 @@ if test ${setjmp_prefix+set}; then https://github.com/ruby/ruby/blob/trunk/ruby_2_2/configure.in#L2306
     if test "${setjmp_prefix}" && eval test '$ac_cv_func_'${setjmp_prefix}setjmp${setjmp_suffix} = no; then
 	AC_MSG_ERROR(${setjmp_prefix}setjmp${setjmp_suffix} is not available)
     fi
-elif { AS_CASE("$ac_cv_func___builtin_setjmp", [yes*], [true], [false]); }; then
+elif { AS_CASE("$ac_cv_func___builtin_setjmp", [yes*], [true], [false]) }; then
     setjmp_cast=`expr "$ac_cv_func___builtin_setjmp" : "yes with cast (\(.*\))"`
     setjmp_prefix=__builtin_
     setjmp_suffix=
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49327)
+++ ruby_2_2/ChangeLog	(revision 49328)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Jan 19 11:57:14 2015  Vit Ondruch  <vondruch@r...>
+
+	* configure.in (RUBY_SETJMP_TYPE): Remove superfluous semicolon
+	  which causes a syntax error with autoconf 2.63.
+	  [ruby-core:67429] [Bug #10716]
+
 Mon Jan 19 11:44:52 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49327)
+++ ruby_2_2/version.h	(revision 49328)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-01-19"
-#define RUBY_PATCHLEVEL 28
+#define RUBY_PATCHLEVEL 29
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49192


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