summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2024-02-11 10:17:35 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2024-02-11 10:17:35 -0800
commitee19d5f4352135a9044a238112738dc66ec50b46 (patch)
treedfccf94a43b43e565502bf6cf913b6aaeaaa9db7
parent2956192801a3e85136d54277409c2ebdea15b3be (diff)
unifdef __UNIXOS2__
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--xdm/auth.c5
-rw-r--r--xdm/dm.c2
-rw-r--r--xdm/util.c2
3 files changed, 2 insertions, 7 deletions
diff --git a/xdm/auth.c b/xdm/auth.c
index 1e24d89..8d9cf51 100644
--- a/xdm/auth.c
+++ b/xdm/auth.c
@@ -93,11 +93,6 @@ from The Open Group.
# endif
#endif
-#ifdef __UNIXOS2__
-# define link rename
-int chown(int a,int b,int c) {}
-# include <io.h>
-#endif
struct AuthProtocol {
unsigned short name_length;
diff --git a/xdm/dm.c b/xdm/dm.c
index d3fe376..931ed60 100644
--- a/xdm/dm.c
+++ b/xdm/dm.c
@@ -480,7 +480,7 @@ WaitForChild (void)
pid_t pid;
struct display *d;
waitType status;
-#if !defined(X_NOT_POSIX) && !defined(__UNIXOS2__)
+#if !defined(X_NOT_POSIX)
sigset_t mask, omask;
#else
int omask;
diff --git a/xdm/util.c b/xdm/util.c
index 732ae35..4d9252f 100644
--- a/xdm/util.c
+++ b/xdm/util.c
@@ -304,7 +304,7 @@ void (*Signal (int sig, SIGFUNC handler))(int)
sigact.sa_flags = 0;
sigaction(sig, &sigact, &osigact);
return osigact.sa_handler;
-#else /* __UNIXOS2__ */
+#else
return signal(sig, handler);
#endif
}