From 01faa93498c3f0430821a0302911422e916fd6de Mon Sep 17 00:00:00 2001
From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Mon, 12 Jul 2010 21:54:28 -0700
Subject: [PATCH] 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.

---
 src/ChangeLog |  6 +++++
 src/process.c | 62 ++++++++++++++++++++++++++-------------------------
 src/term.c    |  9 --------
 3 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index d7d2f935492..65d71cda7aa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 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 ...
diff --git a/src/process.c b/src/process.c
index 95721a2bd91..275f3c15898 100644
--- a/src/process.c
+++ b/src/process.c
@@ -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
diff --git a/src/term.c b/src/term.c
index 5ffd7416bbd..3233db84cf7 100644
--- a/src/term.c
+++ b/src/term.c
@@ -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);
     }
-- 
2.39.2