diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 11:39:21 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 11:39:21 +0000 |
commit | b76d7afffc5f455bbe1b3fac95ed8f2c4a26fe42 (patch) | |
tree | 0a244ca3c43c9edd11d37c6a4278f5f43cdbf1c8 /internal.h | |
parent | ef62988ecce58edc1ffbd6aa70ffd328a03b0923 (diff) |
merge revision(s) 55181: [Backport #12431]
* transcode.c (str_transcode0): scrub in the given encoding when
the source encoding is given, not in the encoding of the
receiver. [ruby-core:75732] [Bug #12431]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'internal.h')
-rw-r--r-- | internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/internal.h b/internal.h index ee55db3cb4..7a76ba2548 100644 --- a/internal.h +++ b/internal.h @@ -990,6 +990,7 @@ void rb_str_fill_terminator(VALUE str, const int termlen); VALUE rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg); #ifdef RUBY_ENCODING_H VALUE rb_external_str_with_enc(VALUE str, rb_encoding *eenc); +VALUE rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl); #endif #define STR_NOEMBED FL_USER1 #define STR_SHARED FL_USER2 /* = ELTS_SHARED */ |