ruby-changes:10528
From: mame <ko1@a...>
Date: Fri, 6 Feb 2009 01:14:04 +0900 (JST)
Subject: [ruby-changes:10528] Ruby:r22081 (trunk): * cont.c (cont_mark, cont_capture, cont_restore_1): use #else instead
mame 2009-02-06 01:13:54 +0900 (Fri, 06 Feb 2009) New Revision: 22081 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22081 Log: * cont.c (cont_mark, cont_capture, cont_restore_1): use #else instead of #elif. a patch from NISHIMATSU Takeshi <t_nissie at yahoo.co.jp> in [ruby-list:45856]. Modified files: trunk/ChangeLog trunk/cont.c Index: ChangeLog =================================================================== --- ChangeLog (revision 22080) +++ ChangeLog (revision 22081) @@ -1,3 +1,9 @@ +Fri Feb 6 01:09:13 2009 Yusuke Endoh <mame@t...> + + * cont.c (cont_mark, cont_capture, cont_restore_1): use #else instead + of #elif. a patch from NISHIMATSU Takeshi <t_nissie at yahoo.co.jp> + in [ruby-list:45856]. + Thu Feb 5 20:28:27 2009 Tanaka Akira <akr@f...> * include/ruby/intern.h (rb_run_exec_options_err): renamed from Index: cont.c =================================================================== --- cont.c (revision 22080) +++ cont.c (revision 22081) @@ -87,7 +87,7 @@ #ifdef CAPTURE_JUST_VALID_VM_STACK rb_gc_mark_locations(cont->vm_stack, cont->vm_stack + cont->vm_stack_slen + cont->vm_stack_clen); -#elif +#else rb_gc_mark_localtion(cont->vm_stack, cont->vm_stack, cont->saved_thread.stack_size); #endif @@ -267,7 +267,7 @@ cont->vm_stack = ALLOC_N(VALUE, cont->vm_stack_slen + cont->vm_stack_clen); MEMCPY(cont->vm_stack, th->stack, VALUE, cont->vm_stack_slen); MEMCPY(cont->vm_stack + cont->vm_stack_slen, (VALUE*)th->cfp, VALUE, cont->vm_stack_clen); -#elif +#else cont->vm_stack = ALLOC_N(VALUE, th->stack_size); MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size); #endif @@ -314,7 +314,7 @@ MEMCPY(th->stack, cont->vm_stack, VALUE, cont->vm_stack_slen); MEMCPY(th->stack + sth->stack_size - cont->vm_stack_clen, cont->vm_stack + cont->vm_stack_slen, VALUE, cont->vm_stack_clen); -#elif +#else MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size); #endif } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/