From 1bac7c84d46f3dc5de4f1eec8b0427dfe6730f2b Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 1 Jul 1997 06:28:48 +0000 Subject: [PATCH] (READ_CHILD_OUTPUT): Macro deleted. (read_process_output): Use read instead of READ_CHILD_OUTPUT. --- src/process.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/process.c b/src/process.c index f8a8445e764..7ac4175aa35 100644 --- a/src/process.c +++ b/src/process.c @@ -2620,12 +2620,6 @@ read_process_output_error_handler (error) Fsleep_for (make_number (2), Qnil); } -#ifdef WINDOWSNT -#define READ_CHILD_OUTPUT read_child_output -#else -#define READ_CHILD_OUTPUT read -#endif - /* Read pending output from the process channel, starting with our buffered-ahead character if we have one. Yield number of decoded characters read. @@ -2695,14 +2689,14 @@ read_process_output (proc, channel) bcopy (coding->carryover, buf, coding->carryover_size); if (proc_buffered_char[channel] < 0) - nchars = READ_CHILD_OUTPUT (channel, buf + coding->carryover_size, - (sizeof buf) - coding->carryover_size); + nchars = read (channel, buf + coding->carryover_size, + (sizeof buf) - coding->carryover_size); else { buf[coding->carryover_size] = proc_buffered_char[channel]; proc_buffered_char[channel] = -1; - nchars = READ_CHILD_OUTPUT (channel, buf + coding->carryover_size + 1, - (sizeof buf) - coding->carryover_size - 1); + nchars = read (channel, buf + coding->carryover_size + 1, + (sizeof buf) - coding->carryover_size - 1); if (nchars < 0) nchars = 1; else -- 2.39.2