github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-04-26 04:17:27 +00:00
Code Issues Projects Releases Wiki Activity

Remove AIX define from Linux, Cygwin, Solaris, OpenBSD. (#320)

Browse Source
This commit is contained in:
Bruce Mitchener
2021-01-29 14:04:57 +07:00
committed by GitHub
parent 805cb86a06
commit 0efeedd6d3
9 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -78,13 +78,8 @@ IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
) )
ENDIF() ENDIF()
IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
LIST(APPEND MAIKO_DEFINITIONS LIST(APPEND MAIKO_DEFINITIONS
"-DAIX" # This is temporary
)
ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
LIST(APPEND MAIKO_DEFINITIONS
"-DAIX" # This is temporary
"-DOS5" "-DOS5"
"-DUSE_DLPI" "-DUSE_DLPI"
) )

4
bin/makefile-cygwin.x86_64-x
View File

@@ -20,9 +20,7 @@ XFLAGS = -DXWINDOW
OEXT = .o OEXT = .o
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = -DAIX \ DFLAGS = -DBYTESWAP -DLOGINT $(XFLAGS) -DRELEASE=351
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm

2
bin/makefile-init.sparc
View File

@@ -45,7 +45,7 @@ OPTFLAGS = -g3 -O
DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
MACHINEFLAGS = -DOS5 -DAIX -DUSE_DLPI \ MACHINEFLAGS = -DOS5 -DUSE_DLPI \
-I$(OPENWINHOME)/include \ -I$(OPENWINHOME)/include \
-DLOGINT -DLOCK_X_UPDATES -DLOGINT -DLOCK_X_UPDATES

4
bin/makefile-linux.386-x
View File

@@ -19,9 +19,7 @@ XFLAGS = -DXWINDOW
OEXT = .o OEXT = .o
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = -DAIX \ DFLAGS = -DBYTESWAP -DLOGINT $(XFLAGS) -DRELEASE=351
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm

4
bin/makefile-linux.armv7l-x
View File

@@ -19,9 +19,7 @@ XFLAGS = -DXWINDOW
OEXT = .o OEXT = .o
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = -DAIX \ DFLAGS = -DBYTESWAP -DLOGINT $(XFLAGS) -DRELEASE=351
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm

4
bin/makefile-linux.x86_64-x
View File

@@ -20,9 +20,7 @@ XFLAGS = -DXWINDOW
OEXT = .o OEXT = .o
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = -DAIX \ DFLAGS = -DBYTESWAP -DLOGINT $(XFLAGS) -DRELEASE=351
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm

4
bin/makefile-openbsd.x86_64-x
View File

@@ -19,9 +19,7 @@ XFLAGS = -I/usr/X11R6/include -DXWINDOW
OEXT = .o OEXT = .o
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = -DAIX \ DFLAGS = -DBYTESWAP -DLOGINT $(XFLAGS) -DRELEASE=351
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351
LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm

2
bin/makefile-sunos5.i386-x
View File

@@ -37,7 +37,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
DFLAGS = $(XFLAGS) \ DFLAGS = $(XFLAGS) \
$(DEBUGFLAGS) \ $(DEBUGFLAGS) \
-DOS5 -DAIX -DUSE_DLPI \ -DOS5 -DUSE_DLPI \
-DBYTESWAP -DLOGINT \ -DBYTESWAP -DLOGINT \
-DLOCK_X_UPDATES \ -DLOCK_X_UPDATES \
-I$(OPENWINHOME)/include \ -I$(OPENWINHOME)/include \

3
src/osmsg.c
View File

@@ -126,6 +126,9 @@ gotpty:
/* Get console IO */ /* Get console IO */
ioctl(ptyfd, FIOCLEX, 0); 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 #ifndef AIX
if ((ioctl(ttyfd, TIOCCONS, 0)) == -1) { if ((ioctl(ttyfd, TIOCCONS, 0)) == -1) {
OSMESSAGE_PRINT(printf("TIOCCONS error\n")); OSMESSAGE_PRINT(printf("TIOCCONS error\n"));