From abe9b8fe3bba6eeaa83f40f2a72ced6ff1020e58 Mon Sep 17 00:00:00 2001 From: bstarynk Date: Mon, 25 Jul 2011 05:49:31 +0000 Subject: 2011-07-25 Basile Starynkevitch MELT branch merged with trunk rev 176732 using svnmerge. 2011-07-25 Basile Starynkevitch * gcc/melt-build.tpl (warmelt-upgrade-translator, meltrun-generate): Use $(WARMELT_LAST). * gcc/melt-built.mk: Regenerate. * gcc/Makefile.in (upgrade-warmelt): Depend upon $(WARMELT_LAST). Merged with trunk. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@176733 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgfortran/ChangeLog | 12 ++++++++++++ libgfortran/intrinsics/ctime.c | 1 + libgfortran/intrinsics/getlog.c | 1 + libgfortran/io/list_read.c | 1 - libgfortran/runtime/stop.c | 1 + 5 files changed, 15 insertions(+), 1 deletion(-) (limited to 'libgfortran') diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 4db1e20a32f..a30f264307a 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,15 @@ +2011-07-23 Andreas Schwab + + * intrinsics/ctime.c: Include . + * intrinsics/getlog.c: Likewise. + * runtime/stop.c: Likewise. + +2011-07-23 Tobias Burnus + + PR fortran/49791 + * io/list_read.c (nml_parse_qualifier): Remove check to + enabled extended read for another case. + 2011-07-15 Daniel Carrera * caf/mpi.c (caf_runtime_error): Change fprintf to vfprintf. diff --git a/libgfortran/intrinsics/ctime.c b/libgfortran/intrinsics/ctime.c index 92c0431357e..1c924a11da4 100644 --- a/libgfortran/intrinsics/ctime.c +++ b/libgfortran/intrinsics/ctime.c @@ -27,6 +27,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "time_1.h" +#include #include diff --git a/libgfortran/intrinsics/getlog.c b/libgfortran/intrinsics/getlog.c index 9e5c8de4677..f4fc0f6e5ef 100644 --- a/libgfortran/intrinsics/getlog.c +++ b/libgfortran/intrinsics/getlog.c @@ -25,6 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "libgfortran.h" +#include #include #ifdef HAVE_UNISTD_H diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index c88f23293a3..01272d0cb4e 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -2213,7 +2213,6 @@ nml_parse_qualifier (st_parameter_dt *dtp, descriptor_dimension *ad, do not allow excess data to be processed. */ if (is_array_section == 1 || !(compile_options.allow_std & GFC_STD_GNU) - || !dtp->u.p.ionml->touched || dtp->u.p.ionml->type == BT_DERIVED) ls[dim].end = ls[dim].start; else diff --git a/libgfortran/runtime/stop.c b/libgfortran/runtime/stop.c index 912dd54fbf7..36174b714f2 100644 --- a/libgfortran/runtime/stop.c +++ b/libgfortran/runtime/stop.c @@ -24,6 +24,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see . */ #include "libgfortran.h" +#include #include #include -- cgit v1.2.1