unifdef SYSV

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

3 files changed, 2 insertions, 13 deletions

diff --git a/xdm/auth.c b/xdm/auth.c
index 8d9cf51..f1ae85c 100644
--- a/xdm/auth.c
+++ b/xdm/auth.c
@@ -53,9 +53,6 @@ from The Open Group.
 #endif
 
 
-#if defined(SYSV) && defined(i386)
-# include <sys/stream.h>
-#endif /* i386 */
 
 #ifdef SVR4
 # include <netdb.h>
diff --git a/xdm/server.c b/xdm/server.c
index ad41e0f..92ac29c 100644
--- a/xdm/server.c
+++ b/xdm/server.c
@@ -175,17 +175,10 @@ serverPause (unsigned t, pid_t serverPid)
     if (!Setjmp (pauseAbort)) {
 	(void) Signal (SIGALRM, serverPauseAbort);
 	(void) Signal (SIGUSR1, serverPauseUsr1);
-#ifdef SYSV
-	if (receivedUsr1)
-	    (void) alarm ((unsigned) 1);
-	else
-	    (void) alarm (t);
-#else
 	if (!receivedUsr1)
 	    (void) alarm (t);
 	else
 	    Debug ("Already received USR1\n");
-#endif
 	for (;;) {
 	    /*
 	     * wait() is unsafe.  Other Xserver or xdm processes may
diff --git a/xdm/session.c b/xdm/session.c
index 39019f2..5cc667e 100644
--- a/xdm/session.c
+++ b/xdm/session.c
@@ -252,7 +252,7 @@ waitAbort (int n)
 	Longjmp (tenaciousClient, 1);
 }
 
-#if defined(_POSIX_SOURCE) || defined(SYSV) || defined(SVR4)
+#if defined(_POSIX_SOURCE) || defined(SVR4)
 # define killpg(pgrp, sig) kill(-(pgrp), sig)
 #endif
 
@@ -899,8 +899,7 @@ execute (char **argv, char **environ)
     Debug ("execve() of %s failed: %s\n", argv[0], _SysErrorMsg (errno));
     /*
      * In case this is a shell script which hasn't been
-     * made executable (or this is a SYSV box), do
-     * a reasonable thing
+     * made executable, do a reasonable thing.
      */
     if (err != ENOENT) {
 	char	program[1024], *e, *p, *optarg;