diff options
| author | dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-12-13 16:06:57 +0000 |
|---|---|---|
| committer | dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-12-13 16:06:57 +0000 |
| commit | 4e187f0e007276a2501108785eb5b1ad5a5140b8 (patch) | |
| tree | e2bac9465f6fb71a028af9ed18ec22aafecaa5a4 /libgfortran | |
| parent | ad656c06f92ba73c5850eb7bf221452f57beee17 (diff) | |
| download | gcc-4e187f0e007276a2501108785eb5b1ad5a5140b8.tar.gz | |
* io/transfer.c (read_sf): Change bitwise "and" to logical "and".
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92094 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 4 | ||||
| -rw-r--r-- | libgfortran/io/transfer.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 9397aa9839d..0b4134c23ea 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,7 @@ +2004-12-13 David Edelsohn <edelsohn@gnu.org> + + * io/transfer.c (read_sf): Change bitwise "and" to logical "and". + 2004-12-12 Richard Henderson <rth@redhat.com> * intrinsics/cshift0.c, intrinsics/eoshift0.c, intrinsics/eoshift2.c, diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 9822a76e950..dc94154243d 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; |