[Emacs-diffs] /srv/bzr/emacs/trunk r100807: Remove subprocesses #ifdefs from term.c.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100807
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Mon 2010-07-12 21:54:28 -0700
message:
  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.
modified:
  src/ChangeLog
  src/process.c
  src/term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-13 04:47:45 +0000
+++ b/src/ChangeLog     2010-07-13 04:54:28 +0000
@@ -1,5 +1,11 @@
 2010-07-13  Dan Nicolaescu  <address@hidden>
 
+       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 ...

=== modified file 'src/process.c'
--- a/src/process.c     2010-07-12 18:44:35 +0000
+++ b/src/process.c     2010-07-13 04:54:28 +0000
@@ -6844,17 +6844,6 @@
 
 
 
-/* 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 @@
     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 @@
 /* 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

=== modified file 'src/term.c'
--- a/src/term.c        2010-07-13 04:47:45 +0000
+++ b/src/term.c        2010-07-13 04:54:28 +0000
@@ -2431,10 +2431,7 @@
         }
 
       reset_sys_modes (t->display_info.tty);
-
-#ifdef subprocesses
       delete_keyboard_wait_descriptor (fileno (f));
-#endif
 
 #ifndef MSDOS
       fclose (f);
@@ -2502,9 +2499,7 @@
       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 @@
   terminal->name = xstrdup (name);
   tty->type = xstrdup (terminal_type);
 
-#ifdef subprocesses
   add_keyboard_wait_descriptor (0);
-#endif
 
   Wcm_clear (tty);
 
@@ -4017,9 +4010,7 @@
 
   if (tty->input)
     {
-#ifdef subprocesses
       delete_keyboard_wait_descriptor (fileno (tty->input));
-#endif
       if (tty->input != stdin)
         fclose (tty->input);
     }