diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/process.c | 14 |
1 files 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) | |||
| 2620 | Fsleep_for (make_number (2), Qnil); | 2620 | Fsleep_for (make_number (2), Qnil); |
| 2621 | } | 2621 | } |
| 2622 | 2622 | ||
| 2623 | #ifdef WINDOWSNT | ||
| 2624 | #define READ_CHILD_OUTPUT read_child_output | ||
| 2625 | #else | ||
| 2626 | #define READ_CHILD_OUTPUT read | ||
| 2627 | #endif | ||
| 2628 | |||
| 2629 | /* Read pending output from the process channel, | 2623 | /* Read pending output from the process channel, |
| 2630 | starting with our buffered-ahead character if we have one. | 2624 | starting with our buffered-ahead character if we have one. |
| 2631 | Yield number of decoded characters read. | 2625 | Yield number of decoded characters read. |
| @@ -2695,14 +2689,14 @@ read_process_output (proc, channel) | |||
| 2695 | bcopy (coding->carryover, buf, coding->carryover_size); | 2689 | bcopy (coding->carryover, buf, coding->carryover_size); |
| 2696 | 2690 | ||
| 2697 | if (proc_buffered_char[channel] < 0) | 2691 | if (proc_buffered_char[channel] < 0) |
| 2698 | nchars = READ_CHILD_OUTPUT (channel, buf + coding->carryover_size, | 2692 | nchars = read (channel, buf + coding->carryover_size, |
| 2699 | (sizeof buf) - coding->carryover_size); | 2693 | (sizeof buf) - coding->carryover_size); |
| 2700 | else | 2694 | else |
| 2701 | { | 2695 | { |
| 2702 | buf[coding->carryover_size] = proc_buffered_char[channel]; | 2696 | buf[coding->carryover_size] = proc_buffered_char[channel]; |
| 2703 | proc_buffered_char[channel] = -1; | 2697 | proc_buffered_char[channel] = -1; |
| 2704 | nchars = READ_CHILD_OUTPUT (channel, buf + coding->carryover_size + 1, | 2698 | nchars = read (channel, buf + coding->carryover_size + 1, |
| 2705 | (sizeof buf) - coding->carryover_size - 1); | 2699 | (sizeof buf) - coding->carryover_size - 1); |
| 2706 | if (nchars < 0) | 2700 | if (nchars < 0) |
| 2707 | nchars = 1; | 2701 | nchars = 1; |
| 2708 | else | 2702 | else |