summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2013-03-11 18:55:18 +0000
committerburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2013-03-11 18:55:18 +0000
commit46b5404e638286dc7ce61079fbe9a0297d06802d (patch)
treec9d8fbc071b373386a30bfa36260a856ead02e93
parent9a49b9c0629c0871303266f258886926c1a7b10e (diff)
downloadgcc-46b5404e638286dc7ce61079fbe9a0297d06802d.tar.gz
2013-03-11 Tobias Burnus <burnus@net-b.de>
* io/transfer.c (read_block_direct): Correct condition. * intrinsics/execute_command_line.c (execute_command_line): Remove dead code for the HAVE_FORK case. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@196603 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libgfortran/ChangeLog6
-rw-r--r--libgfortran/intrinsics/execute_command_line.c2
-rw-r--r--libgfortran/io/transfer.c2
3 files changed, 9 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 54ac5738c01..5412835903a 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-11 Tobias Burnus <burnus@net-b.de>
+
+ * io/transfer.c (read_block_direct): Correct condition.
+ * intrinsics/execute_command_line.c (execute_command_line):
+ Remove dead code for the HAVE_FORK case.
+
2013-02-21 Janne Blomqvist <jb@gcc.gnu.org>
PR libfortran/30162
diff --git a/libgfortran/intrinsics/execute_command_line.c b/libgfortran/intrinsics/execute_command_line.c
index d0f812dcacd..fa6ea9fbc34 100644
--- a/libgfortran/intrinsics/execute_command_line.c
+++ b/libgfortran/intrinsics/execute_command_line.c
@@ -94,8 +94,10 @@ execute_command_line (const char *command, bool wait, int *exitstat,
if (res == -1)
set_cmdstat (cmdstat, EXEC_SYSTEMFAILED);
+#ifndef HAVE_FORK
else if (!wait)
set_cmdstat (cmdstat, EXEC_SYNCHRONOUS);
+#endif
else
set_cmdstat (cmdstat, EXEC_NOERROR);
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index 515c34f378e..d97a325a772 100644
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -641,7 +641,7 @@ read_block_direct (st_parameter_dt *dtp, void *buf, size_t nbytes)
have_read_subrecord = sread (dtp->u.p.current_unit->s,
buf + have_read_record, to_read_subrecord);
- if (unlikely (have_read_subrecord) < 0)
+ if (unlikely (have_read_subrecord < 0))
{
generate_error (&dtp->common, LIBERROR_OS, NULL);
return;