usa	2013-01-11 17:04:20 +0900 (Fri, 11 Jan 2013)

  New Revision: 38779

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

  Log:
    merge revision(s) 37661: [Backport #7633]
    
    * vm_exec.h (GENTRY): GENTRY should be pointer size.
      A patch by yoshidam (Yoshida Masato) [Bug #7332].

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/version.h
    branches/ruby_1_9_3/vm_exec.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 38778)
+++ ruby_1_9_3/ChangeLog	(revision 38779)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Fri Jan 11 17:02:59 2013  Koichi Sasada  <ko1@a...>
+
+	* 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  <usa@r...>
 
 	* vm_trace.c (rb_threadptr_exec_event_hooks): added a parameter to pop
Index: ruby_1_9_3/vm_exec.h
===================================================================
--- ruby_1_9_3/vm_exec.h	(revision 38778)
+++ ruby_1_9_3/vm_exec.h	(revision 38779)
@@ -15,7 +15,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/vm_exec.h#L15
 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
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38778)
+++ ruby_1_9_3/version.h	(revision 38779)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #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

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r37661


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