* eval.c (proc_invoke): should not overwrite block information in

  current frame.  [ruby-dev:28957]

* eval.c (rb_yield_0): retrieve proper block object from the frame
  record.

* eval.c (proc_alloc): return preserved block object if it's
  available.

* st.h (st_data_t): use pointer sized integer for st_data_t.
  [ruby-dev:28988]


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

1 files changed, 1 insertions, 1 deletions

diff --git a/ruby.h b/ruby.h
index cb34af2d5..3a8ffaad1 100644
--- a/ruby.h
+++ b/ruby.h
@@ -606,7 +606,7 @@ VALUE rb_require(const char*);
 
 #ifdef __ia64
 void ruby_init_stack(VALUE*, void*);
-#define RUBY_INIT_STACK \
+#define RUBY_INTT_STACK \
     VALUE variable_in_this_stack_frame; \
     ruby_init_stack(&variable_in_this_stack_frame, rb_ia64_bsp());
 #else