From e6a5d898c50488abe28006e42acf4594c2adf540 Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Wed, 16 Dec 2020 00:02:26 +0700
Subject: [PATCH] Remove more AIX (but not really AIX) ifdefs. (#66)

Trying to remove / replace / update all remaining AIX ifdefs.
---
 src/bbtsub.c   | 7 -------
 src/osmsg.c    | 4 ++--
 src/testtool.c | 3 ---
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/bbtsub.c b/src/bbtsub.c
index 8d64357..9437744 100644
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -81,13 +81,6 @@ static char *id = "$Id: bbtsub.c,v 1.3 2001/12/24 01:08:59 sybalsky Exp $ Copyri
 
 extern IOPAGE *IOPage68K;
 
-#ifdef AIX
-#include <sys/types.h>
-#if !defined(LINUX) && !defined(MACOSX) /* LINUX and MACOSX have no macros.h */
-#include <macros.h>
-#endif /* LINUX */
-#endif /* AIX */
-
 #include "bb.h"
 #include "bitblt.h"
 #include "pilotbbt.h"
diff --git a/src/osmsg.c b/src/osmsg.c
index 52fe8f6..bf7f015 100644
--- a/src/osmsg.c
+++ b/src/osmsg.c
@@ -27,9 +27,9 @@ static char *id = "$Id: osmsg.c,v 1.2 1999/01/03 02:07:29 sybalsky Exp $ Copyrig
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#ifndef AIX
+#ifndef XWINDOW
 #include <sys/ioctl.h>
-#endif /* AIX */
+#endif
 #include <sys/statvfs.h>
 #include <sys/time.h>
 #endif /* DOS */
diff --git a/src/testtool.c b/src/testtool.c
index 86e8d67..a6e92dd 100644
--- a/src/testtool.c
+++ b/src/testtool.c
@@ -44,9 +44,6 @@ static char *id = "$Id: testtool.c,v 1.4 2001/12/24 01:09:07 sybalsky Exp $ Copy
 */
 #include <stdio.h>
 #include <setjmp.h>
-#ifdef AIX
-#include <sys/types.h>
-#endif /* AIX */
 
 #include "lispemul.h"
 #include "lispmap.h"