merges r20589 from trunk into ruby_1_9_1.

* .gdbinit (rp): fixed typo for T_STRUCT.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20678 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 1 deletions

diff --git a/.gdbinit b/.gdbinit
index c2a8b28d0b..2e882cd19b 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -158,7 +158,7 @@ define rp
     print (struct RStruct *)$arg0
     x/xw (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
           ((struct RStruct *)$arg0)->as.ary : \
-          ((struct RStruct *)$arg0)->as.heap.len)
+          ((struct RStruct *)$arg0)->as.heap.ptr)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_BIGNUM
     printf "T_BIGNUM: sign=%d len=%ld ", \
diff --git a/ChangeLog b/ChangeLog
index 7cc84f81bf..9632192f27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec  9 12:08:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* .gdbinit (rp): fixed typo for T_STRUCT.
+
 Tue Dec  9 03:21:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* mkconfig.rb: fix for continued lines.  based on a patch from