* include/ruby/encoding.h (rb_econv_t): use rb_econv_option_t.

* transcode.c: follow the rb_econv_t change.



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

1 files changed, 5 insertions, 5 deletions

diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 9ad7d3b53..55b5bde35 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -216,6 +216,11 @@ typedef struct {
 
 typedef struct {
     int flags;
+    /* replacement character, etc. */
+} rb_econv_option_t;
+
+typedef struct {
+    rb_econv_option_t opts;
     const char *source_encoding_name;
     const char *destination_encoding_name;
 
@@ -247,11 +252,6 @@ typedef struct {
     rb_encoding *destination_encoding;
 } rb_econv_t;
 
-typedef struct {
-    int flags;
-    /* replacement character, etc. */
-} rb_econv_option_t;
-
 VALUE rb_str_transcode(VALUE str, VALUE to, rb_econv_option_t *ecopts);
 
 void rb_econv_opts(VALUE hash, rb_econv_option_t *opts);