diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-05 16:13:54 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-05 16:13:54 +0000 |
| commit | 1c032221b2877571d62a5f27fa55b3a8393ee442 (patch) | |
| tree | 2fcc9d2f3db98f9cbb730e5729acd81d8780efab | |
| parent | 9dd6bd154786757ac412baa1e51a093d565fd364 (diff) | |
| download | ruby-1c032221b2877571d62a5f27fa55b3a8393ee442.tar.gz ruby-1c032221b2877571d62a5f27fa55b3a8393ee442.tar.xz ruby-1c032221b2877571d62a5f27fa55b3a8393ee442.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@22081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | cont.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Fri Feb 6 01:09:13 2009 Yusuke Endoh <mame@tsg.ne.jp> + + * 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@fsij.org> * include/ruby/intern.h (rb_run_exec_options_err): renamed from @@ -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 } |