From 21f84dd4284962201545aa8966f4358bbe8fbcd1 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 11 Jan 2013 08:04:20 +0000 Subject: merge revision(s) 37661: [Backport #7633] * vm_exec.h (GENTRY): GENTRY should be pointer size. A patch by yoshidam (Yoshida Masato) [Bug #7332]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ version.h | 2 +- vm_exec.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f0755df3f..ae1b43188c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 11 17:02:59 2013 Koichi Sasada + + * vm_exec.h (GENTRY): GENTRY should be pointer size. + A patch by yoshidam (Yoshida Masato) [Bug #7332]. + Fri Jan 11 16:57:31 2013 NAKAMURA Usaku * vm_trace.c (rb_threadptr_exec_event_hooks): added a parameter to pop diff --git a/version.h b/version.h index 493488b000..3e49529f44 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 364 +#define RUBY_PATCHLEVEL 365 #define RUBY_RELEASE_DATE "2013-01-11" #define RUBY_RELEASE_YEAR 2013 diff --git a/vm_exec.h b/vm_exec.h index caf752a76b..0a0455d292 100644 --- a/vm_exec.h +++ b/vm_exec.h @@ -15,7 +15,7 @@ typedef long OFFSET; typedef unsigned long lindex_t; typedef unsigned long dindex_t; -typedef rb_num_t GENTRY; +typedef VALUE GENTRY; typedef rb_iseq_t *ISEQ; #ifdef COLLECT_USAGE_ANALYSIS -- cgit v1.2.3