merge revision(s) 42060: [Backport #9915]

	* ext/pathname/pathname.c (path_inspect): use PRIsVALUE to preserve
	  the result encoding.


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

3 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 7bb0ca8e25..eb6c985a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 15 15:35:39 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/pathname/pathname.c (path_inspect): use PRIsVALUE to preserve
+	  the result encoding.
+
 Wed Sep 17 15:09:16 2014  Natalie Weizenbaum  <nweiz@google.com>
 
 	* ext/pathname/lib/pathname.rb (SAME_PATHS):
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index 2bb6ce2f3c..dbd58ae7f9 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -183,7 +183,7 @@ path_inspect(VALUE self)
 {
     const char *c = rb_obj_classname(self);
     VALUE str = get_strpath(self);
-    return rb_sprintf("#<%s:%s>", c, RSTRING_PTR(str));
+    return rb_sprintf("#<%s:%"PRIsVALUE">", c, str);
 }
 
 /*
diff --git a/version.h b/version.h
index 21503303c4..64c2c5b82a 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-09-19"
-#define RUBY_PATCHLEVEL 576
+#define RUBY_RELEASE_DATE "2014-10-15"
+#define RUBY_PATCHLEVEL 577
 
 #define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_MONTH 10
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"