nobu	2010-05-12 16:34:23 +0900 (Wed, 12 May 2010)

  New Revision: 27757

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

  Log:
    merge frrom trunk (r27729)

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/eval_intern.h
    branches/ruby_1_9_2/vm_dump.c
    branches/ruby_1_9_2/vm_method.c

Index: ruby_1_9_2/eval_intern.h
===================================================================
--- ruby_1_9_2/eval_intern.h	(revision 27756)
+++ ruby_1_9_2/eval_intern.h	(revision 27757)
@@ -210,6 +210,7 @@
 void rb_thread_terminate_all(void);
 VALUE rb_vm_top_self();
 VALUE rb_vm_cbase(void);
+int rb_vm_get_sourceline(const rb_control_frame_t *);
 void rb_trap_restore_mask(void);
 
 #ifndef CharNext		/* defined as CharNext[AW] on Windows. */
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27756)
+++ ruby_1_9_2/ChangeLog	(revision 27757)
@@ -1,3 +1,7 @@
+Wed May 12 16:34:20 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval_intern.h (rb_vm_get_sourceline): add prototype.
+
 Wed May 12 16:25:46 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* numeric.c (flo_to_s): exponent needs 2 digits.
Index: ruby_1_9_2/vm_method.c
===================================================================
--- ruby_1_9_2/vm_method.c	(revision 27756)
+++ ruby_1_9_2/vm_method.c	(revision 27757)
@@ -304,7 +304,6 @@
 rb_method_entry_t *
 rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *opts, rb_method_flag_t noex)
 {
-    int rb_vm_get_sourceline(const rb_control_frame_t *cfp);
     rb_thread_t *th;
     rb_control_frame_t *cfp;
     int line;
Index: ruby_1_9_2/vm_dump.c
===================================================================
--- ruby_1_9_2/vm_dump.c	(revision 27756)
+++ ruby_1_9_2/vm_dump.c	(revision 27757)
@@ -103,8 +103,6 @@
 	    iseq_name = "<ifunc>";
 	}
 	else {
-	    int rb_vm_get_sourceline(rb_control_frame_t *);
-
 	    pc = cfp->pc - cfp->iseq->iseq_encoded;
 	    iseq_name = RSTRING_PTR(cfp->iseq->name);
 	    line = rb_vm_get_sourceline(cfp);

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