From 0efeedd6d32cdbbccd84c77e183760a796b75eae Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Fri, 29 Jan 2021 14:04:57 +0700
Subject: [PATCH] Remove AIX define from Linux, Cygwin, Solaris, OpenBSD.
 (#320)

---
 CMakeLists.txt                | 7 +------
 bin/makefile-cygwin.x86_64-x  | 4 +---
 bin/makefile-init.sparc       | 2 +-
 bin/makefile-linux.386-x      | 4 +---
 bin/makefile-linux.armv7l-x   | 4 +---
 bin/makefile-linux.x86_64-x   | 4 +---
 bin/makefile-openbsd.x86_64-x | 4 +---
 bin/makefile-sunos5.i386-x    | 2 +-
 src/osmsg.c                   | 3 +++
 9 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c380fd..da6b3d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,13 +78,8 @@ IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
   )
 ENDIF()
 
-IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
   LIST(APPEND MAIKO_DEFINITIONS
-    "-DAIX" # This is temporary
-  )
-ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
-  LIST(APPEND MAIKO_DEFINITIONS
-    "-DAIX" # This is temporary
     "-DOS5"
     "-DUSE_DLPI"
   )
diff --git a/bin/makefile-cygwin.x86_64-x b/bin/makefile-cygwin.x86_64-x
index f1df5c3..06e6e69 100644
--- a/bin/makefile-cygwin.x86_64-x
+++ b/bin/makefile-cygwin.x86_64-x
@@ -20,9 +20,7 @@ XFLAGS = -DXWINDOW
 OEXT = .o
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = -DAIX \
-	-DBYTESWAP -DLOGINT  $(XFLAGS) \
-	-DRELEASE=351
+DFLAGS = -DBYTESWAP -DLOGINT $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
diff --git a/bin/makefile-init.sparc b/bin/makefile-init.sparc
index 949d575..2ec03fe 100644
--- a/bin/makefile-init.sparc
+++ b/bin/makefile-init.sparc
@@ -45,7 +45,7 @@ OPTFLAGS = -g3 -O
 
 DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 
-MACHINEFLAGS = -DOS5 -DAIX -DUSE_DLPI \
+MACHINEFLAGS = -DOS5 -DUSE_DLPI \
 		-I$(OPENWINHOME)/include \
 		-DLOGINT -DLOCK_X_UPDATES
 
diff --git a/bin/makefile-linux.386-x b/bin/makefile-linux.386-x
index 3118c94..0e6b9d9 100644
--- a/bin/makefile-linux.386-x
+++ b/bin/makefile-linux.386-x
@@ -19,9 +19,7 @@ XFLAGS = -DXWINDOW
 OEXT = .o
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = -DAIX \
-	-DBYTESWAP -DLOGINT  $(XFLAGS) \
-	-DRELEASE=351
+DFLAGS = -DBYTESWAP -DLOGINT $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
diff --git a/bin/makefile-linux.armv7l-x b/bin/makefile-linux.armv7l-x
index 10c171e..ee37771 100644
--- a/bin/makefile-linux.armv7l-x
+++ b/bin/makefile-linux.armv7l-x
@@ -19,9 +19,7 @@ XFLAGS = -DXWINDOW
 OEXT = .o
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = -DAIX \
-	-DBYTESWAP -DLOGINT  $(XFLAGS) \
-	-DRELEASE=351
+DFLAGS = -DBYTESWAP -DLOGINT $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
diff --git a/bin/makefile-linux.x86_64-x b/bin/makefile-linux.x86_64-x
index f1df5c3..06e6e69 100644
--- a/bin/makefile-linux.x86_64-x
+++ b/bin/makefile-linux.x86_64-x
@@ -20,9 +20,7 @@ XFLAGS = -DXWINDOW
 OEXT = .o
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = -DAIX \
-	-DBYTESWAP -DLOGINT  $(XFLAGS) \
-	-DRELEASE=351
+DFLAGS = -DBYTESWAP -DLOGINT $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
diff --git a/bin/makefile-openbsd.x86_64-x b/bin/makefile-openbsd.x86_64-x
index fc80f02..7a238b4 100644
--- a/bin/makefile-openbsd.x86_64-x
+++ b/bin/makefile-openbsd.x86_64-x
@@ -19,9 +19,7 @@ XFLAGS = -I/usr/X11R6/include -DXWINDOW
 OEXT = .o
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = -DAIX \
-	-DBYTESWAP -DLOGINT  $(XFLAGS) \
-	-DRELEASE=351
+DFLAGS = -DBYTESWAP -DLOGINT $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11R6/lib -lX11 -lc -lm
diff --git a/bin/makefile-sunos5.i386-x b/bin/makefile-sunos5.i386-x
index 2d605d5..bbf05dc 100644
--- a/bin/makefile-sunos5.i386-x
+++ b/bin/makefile-sunos5.i386-x
@@ -37,7 +37,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
  
 DFLAGS = $(XFLAGS) \
 	$(DEBUGFLAGS) \
-	-DOS5 -DAIX -DUSE_DLPI \
+	-DOS5 -DUSE_DLPI \
 	-DBYTESWAP -DLOGINT \
 	-DLOCK_X_UPDATES   \
 	-I$(OPENWINHOME)/include \
diff --git a/src/osmsg.c b/src/osmsg.c
index 3e77bd0..7115da1 100644
--- a/src/osmsg.c
+++ b/src/osmsg.c
@@ -126,6 +126,9 @@ gotpty:
 
   /* Get console IO */
   ioctl(ptyfd, FIOCLEX, 0);
+  /* It isn't clear which platforms this #ifndef should
+   * actually apply to. The AIX define used to apply
+   * to a number of platforms, not just AIX-actual. */
 #ifndef AIX
   if ((ioctl(ttyfd, TIOCCONS, 0)) == -1) {
     OSMESSAGE_PRINT(printf("TIOCCONS error\n"));