diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 09:47:50 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 09:47:50 +0000 |
commit | 32c10534e2f4e45b6e34db2b2595db4d096ca4d1 (patch) | |
tree | 6019c3d0d3cf36e5a09f180b59d0545c56520dc2 /cont.c | |
parent | 71a800a5f352add937779872623e6880936699bf (diff) |
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 <t_nissie at yahoo.co.jp>
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
Diffstat (limited to 'cont.c')
-rw-r--r-- | cont.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 } |