diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2017-11-29 11:01:49 +0200 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2017-11-29 11:01:49 +0200 |
| commit | 8801187868ac319744b6cd55ca3a1f37502d538f (patch) | |
| tree | 8a2236831b2786c2ce2c47f8d84ccf17be7a684e | |
| parent | 4c42d640b2087d86da862a6c38a2687dfa4e3efc (diff) | |
| download | gcc-8801187868ac319744b6cd55ca3a1f37502d538f.zip gcc-8801187868ac319744b6cd55ca3a1f37502d538f.tar.gz gcc-8801187868ac319744b6cd55ca3a1f37502d538f.tar.bz2 | |
fix merge conflict in libgfortran/ChangeLog
From-SVN: r255227
| -rw-r--r-- | libgfortran/ChangeLog | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 251e6b4..a1cf6b8 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,7 +1,22 @@ +2017-11-28 Janne Blomqvist <jb@gcc.gnu.org> + + PR fortran/53796 + * io/inquire.c (inquire_via_unit): Set recl to -1 for unconnected + units. + * io/io.h (default_recl): New variable. + * io/open.c (new_unit): Set recl to default_recl for sequential, + -2 for stream access. + * io/transfer.c (read_block_form): Test against default_recl + instead of DEFAULT_RECL. + (write_block): Likewise. + * io/unit.c (init_units): Calculate max_offset, default_recl. + * libgfortran.h (DEFAULT_RECL): Remove. + * runtime/environ.c: Remove GFORTRAN_DEFAULT_RECL. + 2017-11-28 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libgfortran/83168 - * io/write.c (select_string): Bump size by one to avoid + * io/write.c (select_string): Bump size by one to avoid overrun. 2017-11-24 Janne Blomqvist <jb@gcc.gnu.org> |