nagachika	2014-08-26 00:06:14 +0900 (Tue, 26 Aug 2014)

  New Revision: 47277

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

  Log:
    merge revision(s) r45512,r45513,r45515: [Backport #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 #9698]

  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 47276)
+++ ruby_2_1/configure.in	(revision 47277)
@@ -2026,21 +2026,23 @@ if test x"${ac_cv_func___builtin_setjmp} https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2026
    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
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47276)
+++ ruby_2_1/ChangeLog	(revision 47277)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Aug 26 00:06:05 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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  <nobu@r...>
 
 	* configure.in (ac_cv_func___builtin_setjmp): __builtin_longjmp()
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47276)
+++ ruby_2_1/version.h	(revision 47277)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45512-45513,45515


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