* callproc.c (Fcall_process, child_setup): If IRIX is #defined,

	call setpgrp with arguments, even if USG is #defined.
	* process.c [IRIX] (create_process): Don't call setpgrp before
	opening the pty.  Call it after doing the TIOCNOTTY ioctl.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/callproc.c b/src/callproc.c
index 51ba9301cdc..55d97a69ac0 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -255,7 +255,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
       {
         if (fd[0] >= 0)
           close (fd[0]);
-#ifdef USG
+#if defined (USG) && !defined (IRIX)
         setpgrp ();
 #else
         setpgrp (pid, pid);
@@ -519,7 +519,7 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir)
   close (out);
   close (err);
 
-#ifdef USG
+#if defined (USG) && !defined (IRIX)
   setpgrp ();                   /* No arguments but equivalent in this case */
 #else
   setpgrp (pid, pid);