From 681b5028d9fe3ecfd7002d43c4d904243fcf2d25 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Mon, 13 Dec 2004 16:06:57 +0000 Subject: * io/transfer.c (read_sf): Change bitwise "and" to logical "and". From-SVN: r92094 --- libgfortran/ChangeLog | 4 ++++ libgfortran/io/transfer.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'libgfortran') diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 9397aa9..0b4134c 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,7 @@ +2004-12-13 David Edelsohn + + * io/transfer.c (read_sf): Change bitwise "and" to logical "and". + 2004-12-12 Richard Henderson * intrinsics/cshift0.c, intrinsics/eoshift0.c, intrinsics/eoshift2.c, diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 9822a76..dc94154 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -162,7 +162,7 @@ read_sf (int *length) /* If we have a line without a terminating \n, drop through to EOR below. */ - if (readlen < 1 & n == 0) + if (readlen < 1 && n == 0) { generate_error (ERROR_END, NULL); return NULL; -- cgit v1.1