yugui	2009-02-22 18:47:50 +0900 (Sun, 22 Feb 2009)

  New Revision: 22514

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22514

  Log:
    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].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/cont.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22513)
+++ ruby_1_9_1/ChangeLog	(revision 22514)
@@ -1,3 +1,9 @@
+Fri Feb  6 01:09:13 2009  Yusuke Endoh  <mame@t...>
+
+	* 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@m...>
 
 	* ext/readline/readline.c (Init_readline): remove_history(0) may be
Index: ruby_1_9_1/cont.c
===================================================================
--- ruby_1_9_1/cont.c	(revision 22513)
+++ ruby_1_9_1/cont.c	(revision 22514)
@@ -87,7 +87,7 @@
 #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->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 @@
 	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
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/