aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorRichard M. Stallman1996-06-11 19:48:13 +0000
committerRichard M. Stallman1996-06-11 19:48:13 +0000
commit0b75e9a4194f34ff1c579c2dabf99424029b540c (patch)
tree26f54d730143ec95cdfa3ae95a54570818c41ee1 /src/process.c
parent588a9a3ece02095d4747dcdab9ba5231c7327552 (diff)
downloademacs-0b75e9a4194f34ff1c579c2dabf99424029b540c.tar.gz
emacs-0b75e9a4194f34ff1c579c2dabf99424029b540c.zip
(wait_reading_process_input): Move the O_NONBLOCK and
O_NDELAY conditionals out of the EWOULDBLOCK conditional.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c
index 4446b2fdfea..3c8d426b814 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2330,7 +2330,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
2330#ifdef EWOULDBLOCK 2330#ifdef EWOULDBLOCK
2331 else if (nread == -1 && errno == EWOULDBLOCK) 2331 else if (nread == -1 && errno == EWOULDBLOCK)
2332 ; 2332 ;
2333#else 2333#endif
2334#ifdef O_NONBLOCK 2334#ifdef O_NONBLOCK
2335 else if (nread == -1 && errno == EAGAIN) 2335 else if (nread == -1 && errno == EAGAIN)
2336 ; 2336 ;
@@ -2346,7 +2346,6 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
2346 ; 2346 ;
2347#endif /* O_NDELAY */ 2347#endif /* O_NDELAY */
2348#endif /* O_NONBLOCK */ 2348#endif /* O_NONBLOCK */
2349#endif /* EWOULDBLOCK */
2350#ifdef HAVE_PTYS 2349#ifdef HAVE_PTYS
2351 /* On some OSs with ptys, when the process on one end of 2350 /* On some OSs with ptys, when the process on one end of
2352 a pty exits, the other end gets an error reading with 2351 a pty exits, the other end gets an error reading with