Mercurial > emacs
comparison src/process.c @ 110594:76b6c21279ec
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.
| author | Jan D <jan.h.d@swipnet.se> |
|---|---|
| date | Sun, 26 Sep 2010 22:48:13 +0200 |
| parents | 27428f586e5d |
| children | 6c735824d0c1 |
comparison
equal
deleted
inserted
replaced
| 110593:27428f586e5d | 110594:76b6c21279ec |
|---|---|
| 199 /* Number of events for which the user or sentinel has been notified. */ | 199 /* Number of events for which the user or sentinel has been notified. */ |
| 200 int update_tick; | 200 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 |
| 209 #if defined (HAVE_GETPEERNAME) || defined (GNU_LINUX) | 211 #if defined (HAVE_GETPEERNAME) || defined (GNU_LINUX) |
| 210 #if defined (O_NONBLOCK) || defined (O_NDELAY) | 212 #if defined (O_NONBLOCK) || defined (O_NDELAY) |
| 4724 if (! read_kbd) | 4726 if (! read_kbd) |
| 4725 Available = non_keyboard_wait_mask; | 4727 Available = non_keyboard_wait_mask; |
| 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 |
| 4733 /* If frame size has changed or the window is newly mapped, | 4739 /* If frame size has changed or the window is newly mapped, |
| 4734 redisplay now, before we start to wait. There is a race | 4740 redisplay now, before we start to wait. There is a race |
