diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | include/ruby/defines.h | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Tue Jun 21 00:22:02 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@it.aoyama.ac.jp> * test/ruby/test_in.rb: Skip test_open_fifo_does_not_block_other_threads diff --git a/configure.in b/configure.in index 063d839478..8232d548a0 100644 --- a/configure.in +++ b/configure.in @@ -2694,6 +2694,7 @@ AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cas 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. diff --git a/include/ruby/defines.h b/include/ruby/defines.h index bc0eda29f2..610fbf4417 100644 --- a/include/ruby/defines.h +++ b/include/ruby/defines.h @@ -130,7 +130,7 @@ extern "C" { # include <sys/select.h> #endif -#if defined HAVE_SETJMPEX_H && defined HAVE__SETJMPEX +#ifdef RUBY_USE_SETJMPEX #include <setjmpex.h> #endif |