* re.c (rb_reg_initialize_m): should raise exception instead of

  compile error.  [ruby-core:03755]

* string.c (rb_str_splice): move rb_str_modify() after
  StringValue(), which may alter the receiver.  [ruby-dev:24878]

* error.c (rb_error_frozen): now raise RuntimeError instead of
  TypeError.


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

1 files changed, 2 insertions, 1 deletions

diff --git a/ruby.h b/ruby.h
index 383afe9333..ed3c3a1591 100644
--- a/ruby.h
+++ b/ruby.h
@@ -425,7 +425,8 @@ struct RBignum {
 #define RFILE(obj)   (R_CAST(RFile)(obj))
 
 #define FL_SINGLETON FL_USER0
-#define FL_MARK      (1<<6)
+#define FL_MARK      (1<<5)
+#define FL_RESERVED  (1<<6)	/* will be used in the future GC */
 #define FL_FINALIZE  (1<<7)
 #define FL_TAINT     (1<<8)
 #define FL_EXIVAR    (1<<9)