Commit 01faa934 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

Remove subprocesses #ifdefs from term.c.

* src/process.c (add_keyboard_wait_descriptor)
(delete_keyboard_wait_descriptor): Move to common section, do
nothing when subprocesses is not defined.
* src/term.c (Fsuspend_tty, Fresume_tty, init_tty): Remove subprocesses #ifdefs.
parent b3ffc17c
2010-07-13 Dan Nicolaescu <dann@ics.uci.edu>
 
Remove subprocesses #ifdefs from term.c.
* process.c (add_keyboard_wait_descriptor)
(delete_keyboard_wait_descriptor): Move to common section, do
nothing when subprocesses is not defined.
* term.c (Fsuspend_tty, Fresume_tty, init_tty): Remove subprocesses #ifdefs.
Convert maybe_fatal to standard C.
* lisp.h (verror): Declare.
* eval.c (verror): New function containing the code from ...
......
......@@ -6844,17 +6844,6 @@ DEFUN ("process-filter-multibyte-p", Fprocess_filter_multibyte_p,
/* Add DESC to the set of keyboard input descriptors. */
void
add_keyboard_wait_descriptor (int desc)
{
FD_SET (desc, &input_wait_mask);
FD_SET (desc, &non_process_wait_mask);
if (desc > max_keyboard_desc)
max_keyboard_desc = desc;
}
static int add_gpm_wait_descriptor_called_flag;
void
......@@ -6869,25 +6858,6 @@ add_gpm_wait_descriptor (int desc)
max_gpm_desc = desc;
}
/* From now on, do not expect DESC to give keyboard input. */
void
delete_keyboard_wait_descriptor (int desc)
{
int fd;
int lim = max_keyboard_desc;
FD_CLR (desc, &input_wait_mask);
FD_CLR (desc, &non_process_wait_mask);
if (desc == max_keyboard_desc)
for (fd = 0; fd < lim; fd++)
if (FD_ISSET (fd, &input_wait_mask)
&& !FD_ISSET (fd, &non_keyboard_wait_mask)
&& !FD_ISSET (fd, &gpm_wait_mask))
max_keyboard_desc = fd;
}
void
delete_gpm_wait_descriptor (int desc)
{
......@@ -7147,6 +7117,38 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
/* The following functions are needed even if async subprocesses are
not supported. Some of them are no-op stubs in that case. */
/* Add DESC to the set of keyboard input descriptors. */
void
add_keyboard_wait_descriptor (int desc)
{
FD_SET (desc, &input_wait_mask);
FD_SET (desc, &non_process_wait_mask);
if (desc > max_keyboard_desc)
max_keyboard_desc = desc;
}
/* From now on, do not expect DESC to give keyboard input. */
void
delete_keyboard_wait_descriptor (int desc)
{
#ifdef subprocesses
int fd;
int lim = max_keyboard_desc;
FD_CLR (desc, &input_wait_mask);
FD_CLR (desc, &non_process_wait_mask);
if (desc == max_keyboard_desc)
for (fd = 0; fd < lim; fd++)
if (FD_ISSET (fd, &input_wait_mask)
&& !FD_ISSET (fd, &non_keyboard_wait_mask)
&& !FD_ISSET (fd, &gpm_wait_mask))
max_keyboard_desc = fd;
#endif /* subprocesses */
}
/* Setup coding systems of PROCESS. */
void
......
......@@ -2431,10 +2431,7 @@ A suspended tty may be resumed by calling `resume-tty' on it. */)
}
reset_sys_modes (t->display_info.tty);
#ifdef subprocesses
delete_keyboard_wait_descriptor (fileno (f));
#endif
#ifndef MSDOS
fclose (f);
......@@ -2502,9 +2499,7 @@ frame's terminal). */)
t->display_info.tty->input = t->display_info.tty->output;
#endif
#ifdef subprocesses
add_keyboard_wait_descriptor (fd);
#endif
if (FRAMEP (t->display_info.tty->top_frame))
{
......@@ -3523,9 +3518,7 @@ init_tty (char *name, char *terminal_type, int must_succeed)
terminal->name = xstrdup (name);
tty->type = xstrdup (terminal_type);
#ifdef subprocesses
add_keyboard_wait_descriptor (0);
#endif
Wcm_clear (tty);
......@@ -4017,9 +4010,7 @@ delete_tty (struct terminal *terminal)
if (tty->input)
{
#ifdef subprocesses
delete_keyboard_wait_descriptor (fileno (tty->input));
#endif
if (tty->input != stdin)
fclose (tty->input);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment