From 9c0ff0c1c817ca27665efb4233f91f1916d8f45b Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 18 May 2013 16:40:10 +0000 Subject: configure.in: setjmpex * configure.in (setjmp-type): check if setjmpex() is really available. workaround for i686-w64-mingw32 which declares it but lacks its definition. * include/ruby/defines.h: include setjmpex.h only if also setjmpex() is available. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- configure.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index eaa203b618..6f559d6395 100644 --- a/configure.in +++ b/configure.in @@ -1724,6 +1724,7 @@ fi AC_CHECK_FUNCS(__syscall) AC_CHECK_FUNCS(_longjmp) # used for AC_ARG_WITH(setjmp-type) AC_CHECK_FUNCS(_setjmp) # used for AC_ARG_WITH(setjmp-type) +AC_CHECK_FUNCS(_setjmpex) # used for AC_ARG_WITH(setjmp-type) AC_CHECK_FUNCS(chroot) AC_CHECK_FUNCS(chsize) AC_CHECK_FUNCS(clock_gettime) @@ -1876,7 +1877,7 @@ if test ${setjmp_prefix+set}; then elif test "$ac_cv_func___builtin_setjmp" = yes; then setjmp_prefix=__builtin_ setjmp_suffix= -elif test "$ac_cv_header_setjmpex_h" = yes; then +elif test "$ac_cv_header_setjmpex_h:$ac_cv_func__setjmpex" = yes:yes; then setjmp_prefix= setjmp_suffix=ex elif test "$ac_cv_func__setjmp" = yes; then -- cgit v1.2.3