(create_process): Test USG_SUBTTY_WORKS.

diff --git a/src/ChangeLog b/src/ChangeLog
index 672c2ec67ad79b20ac195be5b62ac6360a17bc6d..d205113d6419b5b21955ab735387bbc7aa87b851 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-29  Richard M. Stallman  <rms@gnu.org>
+
+       * sysdep.c [!VMS]: Include sys/file.h.
+       (sys_signal): Test BROKEN_SA_RESTART.
+       
+       * s/hpux11.h (USG_SUBTTY_WORKS): Defined.
+       (BROKEN_SA_RESTART): Defined.
+
+       * process.c (create_process): Test USG_SUBTTY_WORKS.
+
 2002-08-27  Kenichi Handa  <handa@etl.go.jp>
 
        * xdisp.c (get_next_display_element): In unibyte case, don't use
@@ -137,7 +147,6 @@
 
        * window.c (Fset_window_hscroll): Doc fix.
 
->>>>>>> 1.1914.2.171
 2002-05-31  Gerd Moellmann  <gerd@gnu.org>
 
        * xterm.c (x_get_char_face_and_encoding): Add parameter DISPLAY_P.

diff --git a/src/process.c b/src/process.c
index d1ad9c7d5d56fd4bc2b4b7c556c3ac62b561bf37..a6f009668dbe759306ce97c58c344c657209892e 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -1329,9 +1329,9 @@ create_process (process, new_argv, current_dir)
 
   if (inchannel >= 0)
     {
-#ifndef USG 
-      /* On USG systems it does not work to open the pty's tty here
-              and then close and reopen it in the child.  */
+#if ! defined (USG) || defined (USG_SUBTTY_WORKS)
+      /* On most USG systems it does not work to open the pty's tty here,
+        then close it and reopen it in the child.  */
 #ifdef O_NOCTTY
       /* Don't let this terminal become our controlling terminal
         (in case we don't have one).  */
@@ -1343,7 +1343,7 @@ create_process (process, new_argv, current_dir)
        report_file_error ("Opening pty", Qnil);
 #else
       forkin = forkout = -1;
-#endif /* not USG */
+#endif /* not USG, or USG_SUBTTY_WORKS */
       pty_flag = 1;
     }
   else