From 1d2a56a60aa9b82a1b0ff8d6378cb854bbc5f174 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 4 Feb 2006 13:54:53 +0000 Subject: * eval.c: apply the FreeBSD getcontext/setcontext workaround only before FreeBSD 7-CURRENT. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bc90734c2c..1d0353d316 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Feb 4 22:51:43 2006 Tanaka Akira + + * eval.c: apply the FreeBSD getcontext/setcontext workaround + only before FreeBSD 7-CURRENT. + Sat Feb 4 21:10:06 2006 NAKAMURA Usaku * win32/win32.c (LK_ERR): ERROR_NOT_LOCKED is not an error. diff --git a/eval.c b/eval.c index 33e82af971..4bfe133b2f 100644 --- a/eval.c +++ b/eval.c @@ -169,7 +169,7 @@ int function_call_may_return_twice_false_2 = 0; (function_call_may_return_twice_false_2 ? \ setjmp(function_call_may_return_twice_jmp_buf) : \ 0), -# elif defined(__FreeBSD__) +# elif defined(__FreeBSD__) && __FreeBSD__ < 7 /* * workaround for FreeBSD/i386 getcontext/setcontext bug. * clear the carry flag by (0 ? ... : ...). -- cgit v1.2.3