[Emacs-diffs] emacs/src ChangeLog callproc.c sysdep.c term.c

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/07/03 13:46:41

Modified files:
        src            : ChangeLog callproc.c sysdep.c term.c 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7627&r2=1.7628
http://cvs.savannah.gnu.org/viewcvs/emacs/src/callproc.c?cvsroot=emacs&r1=1.247&r2=1.248
http://cvs.savannah.gnu.org/viewcvs/emacs/src/sysdep.c?cvsroot=emacs&r1=1.331&r2=1.332
http://cvs.savannah.gnu.org/viewcvs/emacs/src/term.c?cvsroot=emacs&r1=1.245&r2=1.246

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7627
retrieving revision 1.7628
diff -u -b -r1.7627 -r1.7628
--- ChangeLog   3 Jul 2009 13:19:05 -0000       1.7627
+++ ChangeLog   3 Jul 2009 13:46:39 -0000       1.7628
@@ -1,5 +1,12 @@
 2009-07-03  Dan Nicolaescu  <address@hidden>
 
+       * 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.
 

Index: callproc.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/callproc.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -b -r1.247 -r1.248
--- callproc.c  29 Apr 2009 19:55:51 -0000      1.247
+++ callproc.c  3 Jul 2009 13:46:41 -0000       1.248
@@ -1127,16 +1127,14 @@
        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]))

Index: sysdep.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/sysdep.c,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -b -r1.331 -r1.332
--- sysdep.c    23 Jun 2009 07:09:59 -0000      1.331
+++ sysdep.c    3 Jul 2009 13:46:41 -0000       1.332
@@ -623,18 +623,11 @@
   }
 
 #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 @@
 /*
  * 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 @@
   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 @@
   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

Index: term.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/term.c,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -b -r1.245 -r1.246
--- term.c      29 Jun 2009 05:28:55 -0000      1.245
+++ term.c      3 Jul 2009 13:46:41 -0000       1.246
@@ -3464,9 +3464,7 @@
 
   tty->type = xstrdup (terminal_type);
 
-#ifdef subprocesses
   add_keyboard_wait_descriptor (fileno (tty->input));
-#endif
 
 #endif /* !DOS_NT */