* sysdep.c (sys_suspend): Remove USG_JOBCTRL #ifdef, unused.

(mkdir): Remove MKDIR_PROTOTYPE #ifdef, unused.

* callproc.c (child_setup): Use #else instead of a separate #ifdef.

* term.c (init_tty): Remove spurious #ifdef.

4 files changed, 13 insertions, 21 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ad7bf8a544b..add7356b7ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2009-07-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * sysdep.c (sys_suspend): Remove USG_JOBCTRL #ifdef, unused.
+        (mkdir): Remove MKDIR_PROTOTYPE #ifdef, unused.
+
+        * callproc.c (child_setup): Use #else instead of a separate #ifdef.
+
+        * term.c (init_tty): Remove spurious #ifdef.
+
         * m/mips.h: Mention this file is also used for netbsd.
         * m/pmax.h: Remove file.
 
diff --git a/src/callproc.c b/src/callproc.c
index cab30475d63..54d270b57ef 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1127,16 +1127,14 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir)
        at least check.  */
     if (chdir (temp) < 0)
       _exit (errno);
-#endif
-
-#ifdef DOS_NT
+#else /* DOS_NT */
     /* Get past the drive letter, so that d:/ is left alone.  */
     if (i > 2 && IS_DEVICE_SEP (temp[1]) && IS_DIRECTORY_SEP (temp[2]))
       {
         temp += 2;
         i -= 2;
       }
-#endif
+#endif /* DOS_NT */
 
     /* Strip trailing slashes for PWD, but leave "/" and "//" alone.  */
     while (i > 2 && IS_DIRECTORY_SEP (temp[i - 1]))
diff --git a/src/sysdep.c b/src/sysdep.c
index 028e6e40957..210ad37fee9 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -623,18 +623,11 @@ sys_suspend ()
   }
 
 #else /* No SIGTSTP */
-#ifdef USG_JOBCTRL /* If you don't know what this is don't mess with it */
-  ptrace (0, 0, 0, 0);          /* set for ptrace - caught by csh */
-  kill (getpid (), SIGQUIT);
-
-#else /* No SIGTSTP or USG_JOBCTRL */
-
 /* On a system where suspending is not implemented,
    instead fork a subshell and let it talk directly to the terminal
    while we wait.  */
   sys_subshell ();
 
-#endif /* no USG_JOBCTRL */
 #endif /* no SIGTSTP */
 }
 
@@ -2782,14 +2775,10 @@ set_file_times (filename, atime, mtime)
 /*
  * Make a directory.
  */
-#ifdef MKDIR_PROTOTYPE
-MKDIR_PROTOTYPE
-#else
 int
 mkdir (dpath, dmode)
      char *dpath;
      int dmode;
-#endif
 {
   int cpid, status, fd;
   struct stat statbuf;
@@ -3211,8 +3200,8 @@ list_system_processes ()
   return proclist;
 }
 
-/* The WINDOWSNT implementation is on w32.c.
-   The MSDOS implementation is on dosfns.c.  */
+/* The WINDOWSNT implementation is in w32.c.
+   The MSDOS implementation is in dosfns.c.  */
 #elif !defined (WINDOWSNT) && !defined (MSDOS)
 
 Lisp_Object
@@ -3754,8 +3743,8 @@ system_process_attributes (Lisp_Object pid)
   return attrs;
 }
 
-/* The WINDOWSNT implementation is on w32.c.
-   The MSDOS implementation is on dosfns.c.  */
+/* The WINDOWSNT implementation is in w32.c.
+   The MSDOS implementation is in dosfns.c.  */
 #elif !defined (WINDOWSNT) && !defined (MSDOS)
 
 Lisp_Object
diff --git a/src/term.c b/src/term.c
index 5176214b136..0d0095785e3 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3464,9 +3464,7 @@ init_tty (char *name, char *terminal_type, int must_succeed)
 
   tty->type = xstrdup (terminal_type);
 
-#ifdef subprocesses
   add_keyboard_wait_descriptor (fileno (tty->input));
-#endif
 
 #endif  /* !DOS_NT */