From 32c10534e2f4e45b6e34db2b2595db4d096ca4d1 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 22 Feb 2009 09:47:50 +0000 Subject: merges r22081 from trunk into ruby_1_9_1. * 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/branches/ruby_1_9_1@22514 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ cont.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77899295e7..c2bb94b3cf 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 07:39:33 2009 Kazuhiro NISHIYAMA * ext/readline/readline.c (Init_readline): remove_history(0) may be diff --git a/cont.c b/cont.c index ab6c79b71b..4ae5e93165 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 } -- cgit v1.2.3