kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r22081 from trunk into ruby_1_9_1.

Browse source 
* 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
This commit is contained in:
yugui 2009-02-22 09:47:50 +00:00
parent 71a800a5f3
commit 32c10534e2
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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 07:39:33 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* ext/readline/readline.c (Init_readline): remove_history(0) may be

6
cont.c
View file

@ -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
}