merges r20224 from trunk into ruby_1_9_1

* include/ruby/intern.h (rb_{external,locale}_str_new_cstr): optimized
  versions for literal strings.

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

1 files changed, 2 insertions, 0 deletions

diff --git a/string.c b/string.c
index 3dd86c911..d931cd9ca 100644
--- a/string.c
+++ b/string.c
@@ -28,6 +28,8 @@
 #undef rb_str_new_cstr
 #undef rb_tainted_str_new_cstr
 #undef rb_usascii_str_new_cstr
+#undef rb_external_str_new_cstr
+#undef rb_locale_str_new_cstr
 #undef rb_str_new2
 #undef rb_str_new3
 #undef rb_str_new4