diff options
| author | Jan D | 2010-09-26 22:21:29 +0200 |
|---|---|---|
| committer | Jan D | 2010-09-26 22:21:29 +0200 |
| commit | bf05eed64046e2ad1cdc22e1ee38d70af23f8888 (patch) | |
| tree | aaa09dfcff06a24c73c2ee55899b84cd13b321c7 /src | |
| parent | 3fad2ad22ee508b6926c71fb87d53728bbc8f240 (diff) | |
| download | emacs-bf05eed64046e2ad1cdc22e1ee38d70af23f8888.tar.gz emacs-bf05eed64046e2ad1cdc22e1ee38d70af23f8888.zip | |
Reinstate ifdef subprocesses.
* process.c (add_keyboard_wait_descriptor) (delete_keyboard_wait_descriptor): Reinstate ifdef subprocesses.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/process.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9474066af76..335938916cf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-09-26 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2010-09-26 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * process.c (add_keyboard_wait_descriptor) | ||
| 4 | (delete_keyboard_wait_descriptor): Reinstate ifdef subprocesses. | ||
| 5 | |||
| 3 | * process.h (add_read_fd, delete_read_fd, add_write_fd) | 6 | * process.h (add_read_fd, delete_read_fd, add_write_fd) |
| 4 | (delete_write_fd): Declare. | 7 | (delete_write_fd): Declare. |
| 5 | 8 | ||
diff --git a/src/process.c b/src/process.c index 6ff8f472c26..d29168bcfd1 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -7086,10 +7086,12 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd, | |||
| 7086 | void | 7086 | void |
| 7087 | add_keyboard_wait_descriptor (int desc) | 7087 | add_keyboard_wait_descriptor (int desc) |
| 7088 | { | 7088 | { |
| 7089 | #ifdef subprocesses /* actually means "not MSDOS" */ | ||
| 7089 | FD_SET (desc, &input_wait_mask); | 7090 | FD_SET (desc, &input_wait_mask); |
| 7090 | FD_SET (desc, &non_process_wait_mask); | 7091 | FD_SET (desc, &non_process_wait_mask); |
| 7091 | if (desc > max_input_desc) | 7092 | if (desc > max_input_desc) |
| 7092 | max_input_desc = desc; | 7093 | max_input_desc = desc; |
| 7094 | #endif | ||
| 7093 | } | 7095 | } |
| 7094 | 7096 | ||
| 7095 | /* From now on, do not expect DESC to give keyboard input. */ | 7097 | /* From now on, do not expect DESC to give keyboard input. */ |
| @@ -7097,6 +7099,7 @@ add_keyboard_wait_descriptor (int desc) | |||
| 7097 | void | 7099 | void |
| 7098 | delete_keyboard_wait_descriptor (int desc) | 7100 | delete_keyboard_wait_descriptor (int desc) |
| 7099 | { | 7101 | { |
| 7102 | #ifdef subprocesses | ||
| 7100 | int fd; | 7103 | int fd; |
| 7101 | int lim = max_input_desc; | 7104 | int lim = max_input_desc; |
| 7102 | 7105 | ||
| @@ -7107,6 +7110,7 @@ delete_keyboard_wait_descriptor (int desc) | |||
| 7107 | for (fd = 0; fd < lim; fd++) | 7110 | for (fd = 0; fd < lim; fd++) |
| 7108 | if (FD_ISSET (fd, &input_wait_mask) || FD_ISSET (fd, &write_mask)) | 7111 | if (FD_ISSET (fd, &input_wait_mask) || FD_ISSET (fd, &write_mask)) |
| 7109 | max_input_desc = fd; | 7112 | max_input_desc = fd; |
| 7113 | #endif | ||
| 7110 | } | 7114 | } |
| 7111 | 7115 | ||
| 7112 | /* Setup coding systems of PROCESS. */ | 7116 | /* Setup coding systems of PROCESS. */ |