diff --git a/ChangeLog b/ChangeLog index 88a255dca2..9c5323dc2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Nov 28 14:56:32 2010 Nobuyoshi Nakada + + * io.c (struct argf): make lineno long, and reorder members. + Sun Nov 28 14:55:42 2010 Nobuyoshi Nakada * thread_win32.c (gvl_release, gvl_init): suppress warnings. diff --git a/io.c b/io.c index 8e1f1b826e..26af3ce6ef 100644 --- a/io.c +++ b/io.c @@ -145,13 +145,12 @@ struct timeval rb_time_interval(VALUE); struct argf { VALUE filename, current_file; - int last_lineno; /* $. */ - int lineno; - int init_p, next_p; + long last_lineno; /* $. */ + long lineno; VALUE argv; char *inplace; - int binmode; struct rb_io_enc_t encs; + char init_p, next_p, binmode; }; static int max_file_descriptor = NOFILE; @@ -6945,7 +6944,7 @@ static VALUE argf_getline(int argc, VALUE *argv, VALUE argf) { VALUE line; - int lineno = ARGF.lineno; + long lineno = ARGF.lineno; retry: if (!next_argv()) return Qnil; @@ -7176,7 +7175,7 @@ rb_f_readlines(int argc, VALUE *argv, VALUE recv) static VALUE argf_readlines(int argc, VALUE *argv, VALUE argf) { - int lineno = ARGF.lineno; + long lineno = ARGF.lineno; VALUE lines, ary; ary = rb_ary_new();