From 495293a136b3eed09920b3a199185b1d9f7b49e6 Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 5 Feb 2009 16:13:54 +0000 Subject: [PATCH] * cont.c (cont_mark, cont_capture, cont_restore_1): use #else instead of #elif. a patch from NISHIMATSU Takeshi in [ruby-list:45856]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ cont.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c00ac9af0c..2173e7e3e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Feb 6 01:09:13 2009 Yusuke Endoh + + * cont.c (cont_mark, cont_capture, cont_restore_1): use #else instead + of #elif. a patch from NISHIMATSU Takeshi + in [ruby-list:45856]. + Thu Feb 5 20:28:27 2009 Tanaka Akira * include/ruby/intern.h (rb_run_exec_options_err): renamed from diff --git a/cont.c b/cont.c index 3014dc19a2..7d1392e7d0 100644 --- a/cont.c +++ b/cont.c @@ -87,7 +87,7 @@ cont_mark(void *ptr) #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_capture(volatile int *stat) 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 @@ cont_restore_1(rb_context_t *cont) 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 }