aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorJan D2010-09-26 22:48:13 +0200
committerJan D2010-09-26 22:48:13 +0200
commit82d6e50bf5113823f9839939b511fbbac8cb66f4 (patch)
tree0898e552d652d553f203a8c28662925987e39981 /src/process.c
parentbf05eed64046e2ad1cdc22e1ee38d70af23f8888 (diff)
downloademacs-82d6e50bf5113823f9839939b511fbbac8cb66f4.tar.gz
emacs-82d6e50bf5113823f9839939b511fbbac8cb66f4.zip
Donät give write_mask to select for W32.
process.c (wait_reading_process_output): Don't pass write_mask to select if SELECT_CANT_DO_WRITE_MASK is defined. (SELECT_CANT_DO_WRITE_MASK): Define if SELECT_CANT_DO_WRITE_MASK.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c
index d29168bcfd1..70cc8250add 100644
--- a/src/process.c
+++ b/src/process.c
@@ -201,8 +201,10 @@ int update_tick;
201 201
202/* Define NON_BLOCKING_CONNECT if we can support non-blocking connects. */ 202/* Define NON_BLOCKING_CONNECT if we can support non-blocking connects. */
203 203
204/* Only W32 has this, it really means that select can't take write mask. */
204#ifdef BROKEN_NON_BLOCKING_CONNECT 205#ifdef BROKEN_NON_BLOCKING_CONNECT
205#undef NON_BLOCKING_CONNECT 206#undef NON_BLOCKING_CONNECT
207#define SELECT_CANT_DO_WRITE_MASK
206#else 208#else
207#ifndef NON_BLOCKING_CONNECT 209#ifndef NON_BLOCKING_CONNECT
208#ifdef HAVE_SELECT 210#ifdef HAVE_SELECT
@@ -4726,7 +4728,11 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
4726 else 4728 else
4727 Available = input_wait_mask; 4729 Available = input_wait_mask;
4728 Writeok = write_mask; 4730 Writeok = write_mask;
4731#ifdef SELECT_CANT_DO_WRITE_MASK
4732 check_write = 0;
4733#else
4729 check_write = 1; 4734 check_write = 1;
4735#endif
4730 check_delay = wait_channel >= 0 ? 0 : process_output_delay_count; 4736 check_delay = wait_channel >= 0 ? 0 : process_output_delay_count;
4731 } 4737 }
4732 4738