ruby-changes:3662
From: ko1@a...
Date: Mon, 21 Jan 2008 12:50:45 +0900 (JST)
Subject: [ruby-changes:3662] nobu - Ruby:r15151 (ruby_1_8, trunk): * eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin.
nobu 2008-01-21 12:50:14 +0900 (Mon, 21 Jan 2008) New Revision: 15151 Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/eval.c branches/ruby_1_8/gc.c trunk/ChangeLog trunk/eval_intern.h trunk/gc.c Log: * eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15151&r2=15150&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15151&r2=15150&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/gc.c?r1=15151&r2=15150&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/eval_intern.h?r1=15151&r2=15150&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/gc.c?r1=15151&r2=15150&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/eval.c?r1=15151&r2=15150&diff_format=u Index: eval_intern.h =================================================================== --- eval_intern.h (revision 15150) +++ eval_intern.h (revision 15151) @@ -81,7 +81,7 @@ #include "vmsruby_private.h" #endif -#if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(HAVE_SIGSETJMP) +#if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(sigsetjmp) && !defined(HAVE_SIGSETJMP) #define ruby_setjmp(env) _setjmp(env) #define ruby_longjmp(env,val) _longjmp(env,val) #else Index: ChangeLog =================================================================== --- ChangeLog (revision 15150) +++ ChangeLog (revision 15151) @@ -1,3 +1,7 @@ +Mon Jan 21 12:50:02 2008 Nobuyoshi Nakada <nobu@r...> + + * eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin. + Mon Jan 21 12:35:00 2008 Nobuyoshi Nakada <nobu@r...> * transcode.c (transcode_loop, str_transcoding_resize): use unsigned Index: gc.c =================================================================== --- gc.c (revision 15150) +++ gc.c (revision 15151) @@ -50,7 +50,7 @@ int rb_io_fptr_finalize(struct rb_io_t*); -#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 Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 15150) +++ ruby_1_8/ChangeLog (revision 15151) @@ -1,3 +1,7 @@ +Mon Jan 21 12:50:02 2008 Nobuyoshi Nakada <nobu@r...> + + * eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin. + Sat Jan 19 11:21:53 2008 Nobuyoshi Nakada <nobu@r...> * configure.in (sigsetjmp): check if available. Index: ruby_1_8/eval.c =================================================================== --- ruby_1_8/eval.c (revision 15150) +++ ruby_1_8/eval.c (revision 15151) @@ -193,7 +193,7 @@ 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) Index: ruby_1_8/gc.c =================================================================== --- ruby_1_8/gc.c (revision 15150) +++ ruby_1_8/gc.c (revision 15151) @@ -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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/