ruby-changes:28762
From: nobu <ko1@a...>
Date: Sun, 19 May 2013 01:40:21 +0900 (JST)
Subject: [ruby-changes:28762] nobu:r40814 (trunk): configure.in: setjmpex
nobu 2013-05-19 01:40:10 +0900 (Sun, 19 May 2013) New Revision: 40814 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40814 Log: 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. Modified files: trunk/ChangeLog trunk/configure.in trunk/include/ruby/defines.h Index: include/ruby/defines.h =================================================================== --- include/ruby/defines.h (revision 40813) +++ include/ruby/defines.h (revision 40814) @@ -61,7 +61,7 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/include/ruby/defines.h#L61 # include <sys/select.h> #endif -#ifdef HAVE_SETJMPEX_H +#if defined HAVE_SETJMPEX_H && defined HAVE__SETJMPEX #include <setjmpex.h> #endif Index: configure.in =================================================================== --- configure.in (revision 40813) +++ configure.in (revision 40814) @@ -1724,6 +1724,7 @@ fi https://github.com/ruby/ruby/blob/trunk/configure.in#L1724 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 https://github.com/ruby/ruby/blob/trunk/configure.in#L1877 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 Index: ChangeLog =================================================================== --- ChangeLog (revision 40813) +++ ChangeLog (revision 40814) @@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Sun May 19 01:39:50 2013 Nobuyoshi Nakada <nobu@r...> + + * 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. + Sat May 18 23:57:46 2013 Nobuyoshi Nakada <nobu@r...> * configure.in (setjmp-type): use setjmpex() on w64-mingw32 to get rid -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/