From 6e19e7a8de5b6ec879850a3d9f4a82652e24f04e Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 3 Sep 2008 15:11:46 +0000
Subject: * include/ruby/encoding.h (rb_econv_option_t): removed.  Since  
 rb_econv_option_t has only one field, int flags, rb_econv_option_t is  
 replaced by int.

* include/ruby/io.h: follow the above change.

* io.c: ditto.

* transcode.c: ditto.



git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 include/ruby/io.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/ruby/io.h')

diff --git a/include/ruby/io.h b/include/ruby/io.h
index cb2df584d..cdef496a9 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -57,7 +57,7 @@ typedef struct rb_io_t {
     struct rb_io_enc_t {
         rb_encoding *enc;
         rb_encoding *enc2;
-        rb_econv_option_t opts;
+        int flags;
     } encs;
 
     rb_econv_t *readconv;
@@ -68,7 +68,7 @@ typedef struct rb_io_t {
 
     rb_econv_t *writeconv;
     VALUE writeconv_stateless;
-    rb_econv_option_t writeconv_pre_opts;
+    int writeconv_pre_flags;
     int writeconv_initialized;
 
 } rb_io_t;
@@ -127,7 +127,7 @@ typedef struct rb_io_t {
     fp->tied_io_for_writing = 0;\
     fp->encs.enc = NULL;\
     fp->encs.enc2 = NULL;\
-    fp->encs.opts.flags = 0;\
+    fp->encs.flags = 0;\
 } while (0)
 
 FILE *rb_io_stdio_file(rb_io_t *fptr);
-- 
cgit