akr	2008-08-24 18:03:04 +0900 (Sun, 24 Aug 2008)

  New Revision: 18815

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18815

  Log:
    * io.c (struct argf): use struct rb_io_enc_t.
      (argf_enc): follow the struct argf change.
      (argf_enc2): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18814)
+++ ChangeLog	(revision 18815)
@@ -1,3 +1,9 @@
+Sun Aug 24 18:02:14 2008  Tanaka Akira  <akr@f...>
+
+	* io.c (struct argf): use struct rb_io_enc_t.
+	  (argf_enc): follow the struct argf change.
+	  (argf_enc2): ditto.
+
 Sun Aug 24 17:36:21 2008  Tanaka Akira  <akr@f...>
 
 	* include/ruby/encoding.h (rb_str_transcode): make 3rd argument
Index: io.c
===================================================================
--- io.c	(revision 18814)
+++ io.c	(revision 18815)
@@ -138,7 +138,7 @@
     VALUE argv;
     char *inplace;
     int binmode;
-    rb_encoding *enc, *enc2;
+    struct rb_io_enc_t encs;
 };
 
 static int max_file_descriptor = NOFILE;
@@ -5743,8 +5743,8 @@
 #define lineno            ARGF.lineno
 #define ruby_inplace_mode ARGF.inplace
 #define argf_binmode      ARGF.binmode
-#define argf_enc          ARGF.enc
-#define argf_enc2         ARGF.enc2
+#define argf_enc          ARGF.encs.enc
+#define argf_enc2         ARGF.encs.enc2
 #define rb_argv           ARGF.argv
 
 static VALUE

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/