merges r24407 from trunk into ruby_1_9_1.

--
* debug.c (ruby_dummy_gdb_enums): made public.  [ruby-dev:39001]

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

4 files changed, 9 insertions, 3 deletions

diff --git a/.gdbinit b/.gdbinit
index f333d7b07..986971880 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -2,6 +2,8 @@ if dummy_gdb_enums.special_consts
 end
 
 define rp
+  if ruby_dummy_gdb_enums.special_consts
+  end
   if (VALUE)$arg0 & RUBY_FIXNUM_FLAG
     printf "FIXNUM: %ld\n", (long)$arg0 >> 1
   else
diff --git a/ChangeLog b/ChangeLog
index 585e2d778..37583df1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug  5 18:46:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* debug.c (ruby_dummy_gdb_enums): made public.  [ruby-dev:39001]
+
 Wed Aug  5 12:39:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_longjmp): reset raised flag before fatal error.
diff --git a/debug.c b/debug.c
index 265e864ae..f1c32b743 100644
--- a/debug.c
+++ b/debug.c
@@ -17,7 +17,7 @@
 #include "vm_core.h"
 
 /* for gdb */
-static const union {
+const union {
     enum ruby_special_consts    special_consts;
     enum ruby_value_type        value_type;
     enum ruby_tag_type          tag_type;
@@ -65,7 +65,7 @@ static const union {
         RUBY_NODE_LMASK     = NODE_LMASK,
         RUBY_NODE_FL_NEWLINE   = NODE_FL_NEWLINE
     } various;
-} dummy_gdb_enums;
+} ruby_dummy_gdb_enums;
 
 const VALUE RUBY_FL_USER19    = FL_USER19;
 
diff --git a/version.h b/version.h
index 5bd5e2e55..189db7803 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 274
+#define RUBY_PATCHLEVEL 275
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1