mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
65ca6391ed
commit
3674064bf2
3 changed files with 8 additions and 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
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue