merges r21660 from trunk into ruby_1_9_1.

* vm_eval.c, eval.c (rb_f_block_given_p): move definition of
  "iterator?" and "block_given?" to make static.
* vm.c (vm_get_ruby_level_caller_cfp): make it static.
* eval_intern.h, vm_insnhelper.c: move decl. of
  vm_get_ruby_level_caller_cfp()
  from eval_intern.h to vm_insnhelper.c.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a77ecefc6..4349bfb56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Jan 19 11:46:39 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c, eval.c (rb_f_block_given_p): move definition of
+	  "iterator?" and "block_given?" to make static.
+
+	* vm.c (vm_get_ruby_level_caller_cfp): make it static.
+
+	* eval_intern.h, vm_insnhelper.c: move decl. of
+	  vm_get_ruby_level_caller_cfp()
+	  from eval_intern.h to vm_insnhelper.c.
+
 Mon Jan 19 11:27:39 2009  Koichi Sasada  <ko1@atdot.net>
 
 	* vm.c: add a prefix "rb_" to exposed functions