summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-26 10:35:00 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-26 10:35:00 +0000
commit942ad83ad852124970690c53532674d7cff6aade (patch)
tree6d1edf5c76e7e71f6de5cc3b7870c82e99fa492d /include
parent714c31316e224f2244b712531d85f48ca04d0202 (diff)
downloadruby-942ad83ad852124970690c53532674d7cff6aade.tar.gz
ruby-942ad83ad852124970690c53532674d7cff6aade.tar.xz
ruby-942ad83ad852124970690c53532674d7cff6aade.zip
* include/ruby/encoding.h (rb_str_encode): renamed from
rb_str_transcode. [ruby-dev:36593] (rb_econv_has_convpath_p): renamed from rb_transcode_convertible. * transcode.c: follow the renaming. * io.c: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
-rw-r--r--include/ruby/encoding.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index b6ac57418..1d1293435 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -208,8 +208,8 @@ typedef enum {
typedef struct rb_econv_t rb_econv_t;
-VALUE rb_str_transcode(VALUE str, VALUE to, int ecflags, VALUE ecopts);
-int rb_transcode_convertible(const char* from_encoding, const char* to_encoding);
+VALUE rb_str_encode(VALUE str, VALUE to, int ecflags, VALUE ecopts);
+int rb_econv_has_convpath_p(const char* from_encoding, const char* to_encoding);
int rb_econv_prepare_opts(VALUE opthash, VALUE *ecopts);