From 9041dfdefc79d965783702444c98ded8c7b2bf9d Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 21 Jan 2008 03:50:14 +0000 Subject: * eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ eval.c | 2 +- gc.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61e33aa723..52422822c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Jan 21 12:50:02 2008 Nobuyoshi Nakada + + * eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin. + Sat Jan 19 11:21:53 2008 Nobuyoshi Nakada * configure.in (sigsetjmp): check if available. diff --git a/eval.c b/eval.c index b8f17da3ea..ae61f47772 100644 --- a/eval.c +++ b/eval.c @@ -193,7 +193,7 @@ static int volatile freebsd_clear_carry_flag = 0; POST_GETCONTEXT, \ (j)->status) #else -# if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(HAVE_SIGSETJMP) +# if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(sigsetjmp) && !defined(HAVE_SIGSETJMP) # define ruby_setjmp(just_before_setjmp, env) \ ((just_before_setjmp), _setjmp(env)) # define ruby_longjmp(env,val) _longjmp(env,val) diff --git a/gc.c b/gc.c index 3aca970ddd..7403c413e3 100644 --- a/gc.c +++ b/gc.c @@ -37,7 +37,7 @@ void re_free_registers _((struct re_registers*)); void rb_io_fptr_finalize _((struct OpenFile*)); -#if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(HAVE_SIGSETJMP) +#if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(sigsetjmp) && !defined(HAVE_SIGSETJMP) #define setjmp(env) _setjmp(env) #endif -- cgit v1.2.3