From a6c6699903bf2f5a49c387e8e1cde9c28f537f76 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 24 Aug 2008 09:03:04 +0000 Subject: * io.c (struct argf): use struct rb_io_enc_t. (argf_enc): follow the struct argf change. (argf_enc2): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ io.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc789d4ab..f46958e71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Aug 24 18:02:14 2008 Tanaka Akira + + * 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 * include/ruby/encoding.h (rb_str_transcode): make 3rd argument diff --git a/io.c b/io.c index ea1528c50..1ca18b901 100644 --- a/io.c +++ b/io.c @@ -138,7 +138,7 @@ struct argf { 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 @@ argf_alloc(VALUE klass) #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 -- cgit