nobu	2016-06-21 00:22:04 +0900 (Tue, 21 Jun 2016)

  New Revision: 55471

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

  Log:
    RUBY_USE_SETJMPEX
    
    * configure.in, include/ruby/defines.h (RUBY_USE_SETJMPEX):
      include setjmpex.h only when using setjmpex() for RUBY_SETJMP.
      the header of mingw32 overrides setjmp() by setjmpex().

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/include/ruby/defines.h
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 55470)
+++ ChangeLog	(revision 55471)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Jun 21 00:22:02 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in, include/ruby/defines.h (RUBY_USE_SETJMPEX):
+	  include setjmpex.h only when using setjmpex() for RUBY_SETJMP.
+	  the header of mingw32 overrides setjmp() by setjmpex().
+
 Mon Jun 20 18:39:16 2016  Martin Duerst  <duerst@i...>
 
 	* test/ruby/test_in.rb: Skip test_open_fifo_does_not_block_other_threads
Index: configure.in
===================================================================
--- configure.in	(revision 55470)
+++ configure.in	(revision 55471)
@@ -2694,6 +2694,7 @@ AC_MSG_RESULT(${setjmp_prefix}setjmp${se https://github.com/ruby/ruby/blob/trunk/configure.in#L2694
 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)
+AS_IF([test x$setjmp_suffix = xex], [AC_DEFINE_UNQUOTED(RUBY_USE_SETJMPEX, 1)])
 ])
 # End of setjmp check.
 
Index: include/ruby/defines.h
===================================================================
--- include/ruby/defines.h	(revision 55470)
+++ include/ruby/defines.h	(revision 55471)
@@ -130,7 +130,7 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/include/ruby/defines.h#L130
 # include <sys/select.h>
 #endif
 
-#if defined HAVE_SETJMPEX_H && defined HAVE__SETJMPEX
+#ifdef RUBY_USE_SETJMPEX
 #include <setjmpex.h>
 #endif
 

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