merge revision(s) r45512,r45513,r45515: [Backport ruby#9698]

	configure.in: indent

	* configure.in (ac_cv_func___builtin_setjmp): adjust indent.
	* configure.in (ac_cv_func___builtin_setjmp): should not skip
	  flags restoration in RUBY_WERROR_FLAG by `break`.
	  [ruby-dev:48086] [Bug ruby#9698]


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

Author: nagachika

ChangeLog

@@ -1,3 +1,9 @@
+Tue Aug 26 00:06:05 2014  Nobuyoshi Nakada  <[email protected]>
+
+	* configure.in (ac_cv_func___builtin_setjmp): should not skip
+	  flags restoration in RUBY_WERROR_FLAG by `break`.
+	  [ruby-dev:48086] [Bug #9698]
+
 Tue Aug 26 00:02:51 2014  Nobuyoshi Nakada  <[email protected]>
 
 	* configure.in (ac_cv_func___builtin_setjmp): __builtin_longjmp()

configure.in

@@ -2026,21 +2026,23 @@ if test x"${ac_cv_func___builtin_setjmp}" = xyes; then
    unset ac_cv_func___builtin_setjmp
 fi
 AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
-[
-for cast in "" "(void *)"; do
-RUBY_WERROR_FLAG(
-[AC_TRY_LINK([@%:@include <setjmp.h>
-    @%:@include <stdio.h>
-    jmp_buf jb;
-    void t(void) {__builtin_longjmp($cast jb, 1);}],
     [
-    void (*volatile f)(void) = t;
-    if (!__builtin_setjmp($cast jb)) printf("%d\n", f != 0);
-    ],
-    [ac_cv_func___builtin_setjmp="yes with cast ($cast)"; break],
-    [ac_cv_func___builtin_setjmp=no])
-])
-done])
+    ac_cv_func___builtin_setjmp=no
+    for cast in "" "(void **)"; do
+	RUBY_WERROR_FLAG(
+	[AC_TRY_LINK([@%:@include <setjmp.h>
+	    @%:@include <stdio.h>
+	    jmp_buf jb;
+	    void t(void) {__builtin_longjmp($cast jb, 1);}
+	    int jump(void) {(void)(__builtin_setjmp($cast jb) ? 1 : 0); return 0;}],
+	    [
+	    void (*volatile f)(void) = t;
+	    if (!jump()) printf("%d\n", f != 0);
+	    ],
+	    [ac_cv_func___builtin_setjmp="yes with cast ($cast)"])
+	])
+	test "$ac_cv_func___builtin_setjmp" = no || break
+    done])
 
 # we don't use _setjmp if _longjmp doesn't exist.
 test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no

version.h

@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-08-26"
-#define RUBY_PATCHLEVEL 210
+#define RUBY_PATCHLEVEL 211
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 8