diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-11 10:41:09 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-11 10:59:59 -0800 |
| commit | 8a9a4e5be8d4906aa7b1365140445db33e6cbbbd (patch) | |
| tree | 4de085a9ed033f79cd1822fc2210a681fe8922d9 | |
| parent | ae942bf8aba373f3d7db6af868e0f8154fdd23f2 (diff) | |
unifdef SYSV
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | chooser/chooser.c | 3 | ||||
| -rw-r--r-- | include/dm.h | 11 | ||||
| -rw-r--r-- | xdm/auth.c | 3 | ||||
| -rw-r--r-- | xdm/server.c | 7 | ||||
| -rw-r--r-- | xdm/session.c | 5 |
5 files changed, 2 insertions, 27 deletions
diff --git a/chooser/chooser.c b/chooser/chooser.c index b4fde8c..c5742f7 100644 --- a/chooser/chooser.c +++ b/chooser/chooser.c @@ -75,9 +75,6 @@ in this Software without prior written authorization from The Open Group. #if defined(SVR4) # include <sys/sockio.h> #endif -#if defined(SYSV) && defined(i386) -# include <sys/stream.h> -#endif #include "dm_socket.h" diff --git a/include/dm.h b/include/dm.h index b281ff4..8663e38 100644 --- a/include/dm.h +++ b/include/dm.h @@ -83,18 +83,11 @@ from The Open Group. # define waitCore(w) 0 /* not in POSIX. so what? */ typedef int waitType; # else /* X_NOT_POSIX */ -# ifdef SYSV -# define waitCode(w) (((w) >> 8) & 0x7f) -# define waitSig(w) ((w) & 0xff) -# define waitCore(w) (((w) >> 15) & 0x01) -typedef int waitType; -# else /* SYSV */ # include <sys/wait.h> # define waitCode(w) ((w).w_T.w_Retcode) # define waitSig(w) ((w).w_T.w_Termsig) # define waitCore(w) ((w).w_T.w_Coredump) typedef union wait waitType; -# endif # endif /* X_NOT_POSIX */ # ifdef USE_PAM @@ -492,10 +485,6 @@ extern void ProcessRequestSocket(int fd); # include <stdlib.h> # if defined(X_NOT_POSIX) || defined(__NetBSD__) && defined(__sparc__) -# if defined(SYSV) -# define SIGNALS_RESET_WHEN_CAUGHT -# define UNRELIABLE_SIGNALS -# endif # define Setjmp(e) setjmp(e) # define Longjmp(e,v) longjmp(e,v) # define Jmp_buf jmp_buf @@ -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; |