2 files changed, 4 insertions, 10 deletions

diff --git a/src/emacs.c b/src/emacs.c
index 3e18c398f13..c38811f117d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -300,11 +300,7 @@ main (argc, argv, envp)
 
 #ifdef BSD
   {
-#ifdef GETPGRP_NO_ARG
-    inherited_pgroup = getpgrp ();
-#else /* THISSENTENCE_NO_VERB */
     inherited_pgroup = getpgrp (0);
-#endif
     setpgrp (0, getpid ());
   }
 #endif
@@ -687,11 +683,7 @@ shut_down_emacs (sig, no_x, stuff)
   {
     int tpgrp;
     if (EMACS_GET_TTY_PGRP (0, &tpgrp) != -1
-#ifdef GETPGRP_NO_ARG
-        && tpgrp == getpgrp ())
-#else
         && tpgrp == getpgrp (0))
-#endif
       {
         fflush (stdout);
         reset_sys_modes ();
diff --git a/src/s/irix4-0.h b/src/s/irix4-0.h
index 70c255044db..e2dbb37c37c 100644
--- a/src/s/irix4-0.h
+++ b/src/s/irix4-0.h
@@ -3,8 +3,6 @@
 #define USG5_3
 #define IRIX4
 
-#define USE_IRIX_BSDPGRP
-
 #define HAVE_ALLOCA
 #ifndef NOT_C_CODE
 #include <alloca.h>
@@ -52,6 +50,10 @@
   strcpy (pty_name, name);                                      \
 }
 
+/* Use the BSD versions of the getpgrp and setpgrp functions.  */
+#define setpgrp(pid, pgrp) BSDsetpgrp((pid), (pgrp))
+#define getpgrp(pid)       BSDgetpgrp(pid)
+
 /* jpff@maths.bath.ac.uk reports `struct exception' is not defined
    on this system, so inhibit use of matherr.  */
 #define NO_MATHERR