merges r23571 from trunk into ruby_1_9_1.

--
* include/ruby/ruby.h (FilePathValue): prevent from GC.

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

3 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b6ff1d2dd..33aa4e059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 26 05:39:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (FilePathValue): prevent from GC.
+
+	* include/ruby/ruby.h (NUM2LONG): added GCC specific optimization.
+
 Tue May 26 03:38:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_each_char, rb_str_each_codepoint): string
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index bcbcacbcb..e098f38cc 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -381,7 +381,7 @@ VALUE rb_str_export(VALUE);
 VALUE rb_str_export_locale(VALUE);
 
 VALUE rb_get_path(VALUE);
-#define FilePathValue(v) ((v) = rb_get_path(v))
+#define FilePathValue(v) (RB_GC_GUARD(v) = rb_get_path(v))
 
 VALUE rb_get_path_no_checksafe(VALUE);
 #define FilePathStringValue(v) ((v) = rb_get_path_no_checksafe(v))
diff --git a/version.h b/version.h
index ea5a8f2b7..46dd46fc3 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 161
+#define RUBY_PATCHLEVEL 162
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1