From 9a21f5339a290f039671bb8b48646d54c3ff06be Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 22 Dec 2020 13:11:39 +0700 Subject: [PATCH] Remove XV11R4 and related defines. (#113) We no longer have anything predicated upon the version of X11 that we're using (and these versions are all ancient anyway). --- bin/makefile-darwin.386-x | 3 +-- bin/makefile-darwin.aarch64-x | 3 +-- bin/makefile-darwin.x86_64-x | 3 +-- bin/makefile-freebsd.386-x | 3 +-- bin/makefile-init.386 | 3 +-- bin/makefile-init.sparc | 3 +-- bin/makefile-linux.386-x | 3 +-- bin/makefile-linux.armv7l-x | 3 +-- bin/makefile-linux.x86_64-x | 3 +-- bin/makefile-sunos3.mc68020-x | 3 +-- bin/makefile-sunos4.1.mc68020-x | 3 +-- bin/makefile-sunos4.1.sparc-x | 3 +-- bin/makefile-sunos4.mc68020-x | 3 +-- bin/makefile-sunos4.sparc-x | 3 +-- bin/makefile-sunos4.sparc-x-3 | 3 +-- bin/makefile-sunos5.386-x | 3 +-- bin/makefile-sunos5.i386-x | 3 +-- bin/makefile-sunos5.sparc-x | 3 +-- bin/makefile-sunos5.x86_64-x | 3 +-- inc/xdefs.h | 32 -------------------------------- 20 files changed, 19 insertions(+), 70 deletions(-) diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x index c365249..042ff44 100644 --- a/bin/makefile-darwin.386-x +++ b/bin/makefile-darwin.386-x @@ -14,8 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xwinman.o -XVERSION = XV11R4 -XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) +XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x index 44463ea..b0a097a 100644 --- a/bin/makefile-darwin.aarch64-x +++ b/bin/makefile-darwin.aarch64-x @@ -14,8 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xwinman.o -XVERSION = XV11R4 -XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) +XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT # OPTFLAGS is normally -O2. OPTFLAGS = -O1 -g diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x index 1692894..0bbcea6 100644 --- a/bin/makefile-darwin.x86_64-x +++ b/bin/makefile-darwin.x86_64-x @@ -14,8 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xwinman.o -XVERSION = XV11R4 -XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) +XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT # OPTFLAGS is normally -O2. OPTFLAGS = -O1 -g diff --git a/bin/makefile-freebsd.386-x b/bin/makefile-freebsd.386-x index 8d21dcc..12172a6 100644 --- a/bin/makefile-freebsd.386-x +++ b/bin/makefile-freebsd.386-x @@ -13,8 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xwinman.o -XVERSION = XV11R4 -XFLAGS = -I/usr/local/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) +XFLAGS = -I/usr/local/include -DXWINDOW -DNOPIXRECT # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-init.386 b/bin/makefile-init.386 index 4237dfc..bfe8f8f 100644 --- a/bin/makefile-init.386 +++ b/bin/makefile-init.386 @@ -14,8 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xwinman.o -XVERSION = XV11R4 -XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) +XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it OPTFLAGS = -O0 -g diff --git a/bin/makefile-init.sparc b/bin/makefile-init.sparc index bed2a4a..2159ab0 100644 --- a/bin/makefile-init.sparc +++ b/bin/makefile-init.sparc @@ -32,8 +32,7 @@ XFILES = $(OBJECTDIR)xlspwin.o \ $(OBJECTDIR)xinit.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -DXV11R4 -I/usr/openwin/include +XFLAGS = -DXWINDOW -I/usr/openwin/include # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-linux.386-x b/bin/makefile-linux.386-x index c0fb662..2cac355 100644 --- a/bin/makefile-linux.386-x +++ b/bin/makefile-linux.386-x @@ -13,8 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xwinman.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) +XFLAGS = -DXWINDOW -DNOPIXRECT # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-linux.armv7l-x b/bin/makefile-linux.armv7l-x index c0fb662..2cac355 100644 --- a/bin/makefile-linux.armv7l-x +++ b/bin/makefile-linux.armv7l-x @@ -13,8 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xwinman.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) +XFLAGS = -DXWINDOW -DNOPIXRECT # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-linux.x86_64-x b/bin/makefile-linux.x86_64-x index 51c7581..abcef97 100644 --- a/bin/makefile-linux.x86_64-x +++ b/bin/makefile-linux.x86_64-x @@ -14,8 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xwinman.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) +XFLAGS = -DXWINDOW -DNOPIXRECT # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-sunos3.mc68020-x b/bin/makefile-sunos3.mc68020-x index 60bbcb9..0aca73f 100644 --- a/bin/makefile-sunos3.mc68020-x +++ b/bin/makefile-sunos3.mc68020-x @@ -25,8 +25,7 @@ XFILES = $(OBJECTDIR)XClose.o \ $(OBJECTDIR)VideoColor.o \ $(OBJECTDIR)XWindowMgr.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -D$(XVERSION) +XFLAGS = -DXWINDOW # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-sunos4.1.mc68020-x b/bin/makefile-sunos4.1.mc68020-x index 9c6e80e..1b8d62e 100644 --- a/bin/makefile-sunos4.1.mc68020-x +++ b/bin/makefile-sunos4.1.mc68020-x @@ -25,8 +25,7 @@ XFILES = $(OBJECTDIR)XClose.o \ $(OBJECTDIR)VideoColor.o \ $(OBJECTDIR)XWindowMgr.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -D$(XVERSION) +XFLAGS = -DXWINDOW # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-sunos4.1.sparc-x b/bin/makefile-sunos4.1.sparc-x index a341cb6..f009cf9 100644 --- a/bin/makefile-sunos4.1.sparc-x +++ b/bin/makefile-sunos4.1.sparc-x @@ -25,8 +25,7 @@ XFILES = $(OBJECTDIR)XClose.o \ $(OBJECTDIR)Xcolor.o \ $(OBJECTDIR)Xwinman.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -D$(XVERSION) +XFLAGS = -DXWINDOW # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-sunos4.mc68020-x b/bin/makefile-sunos4.mc68020-x index 7f6ca5a..e02e942 100644 --- a/bin/makefile-sunos4.mc68020-x +++ b/bin/makefile-sunos4.mc68020-x @@ -25,8 +25,7 @@ XFILES = $(OBJECTDIR)XClose.o \ $(OBJECTDIR)VideoColor.o \ $(OBJECTDIR)XWindowMgr.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -D$(XVERSION) +XFLAGS = -DXWINDOW # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-sunos4.sparc-x b/bin/makefile-sunos4.sparc-x index c44d460..6e16759 100644 --- a/bin/makefile-sunos4.sparc-x +++ b/bin/makefile-sunos4.sparc-x @@ -12,8 +12,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ CC = gcc -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) +XFLAGS = -DXWINDOW -DNOPIXRECT # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-sunos4.sparc-x-3 b/bin/makefile-sunos4.sparc-x-3 index fcd217d..89dab0c 100644 --- a/bin/makefile-sunos4.sparc-x-3 +++ b/bin/makefile-sunos4.sparc-x-3 @@ -25,8 +25,7 @@ XFILES = $(OBJECTDIR)XClose.o \ $(OBJECTDIR)VideoColor.o \ $(OBJECTDIR)XWindowMgr.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -D$(XVERSION) +XFLAGS = -DXWINDOW # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-sunos5.386-x b/bin/makefile-sunos5.386-x index c51a531..0c29e74 100644 --- a/bin/makefile-sunos5.386-x +++ b/bin/makefile-sunos5.386-x @@ -22,8 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xrdopt.o \ $(OBJECTDIR)xwinman.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) +XFLAGS = -DXWINDOW -DNOPIXRECT # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-sunos5.i386-x b/bin/makefile-sunos5.i386-x index 9dc9de3..44f9495 100644 --- a/bin/makefile-sunos5.i386-x +++ b/bin/makefile-sunos5.i386-x @@ -22,8 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xrdopt.o \ $(OBJECTDIR)xwinman.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -D$(XVERSION) +XFLAGS = -DXWINDOW # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-sunos5.sparc-x b/bin/makefile-sunos5.sparc-x index d2fc0c9..5c543b2 100644 --- a/bin/makefile-sunos5.sparc-x +++ b/bin/makefile-sunos5.sparc-x @@ -29,8 +29,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xrdopt.o \ $(OBJECTDIR)xwinman.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -D$(XVERSION) +XFLAGS = -DXWINDOW # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-sunos5.x86_64-x b/bin/makefile-sunos5.x86_64-x index 67c01e8..af4855a 100644 --- a/bin/makefile-sunos5.x86_64-x +++ b/bin/makefile-sunos5.x86_64-x @@ -22,8 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xrdopt.o \ $(OBJECTDIR)xwinman.o -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) +XFLAGS = -DXWINDOW -DNOPIXRECT # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/inc/xdefs.h b/inc/xdefs.h index b24a2b0..2d11591 100755 --- a/inc/xdefs.h +++ b/inc/xdefs.h @@ -50,36 +50,4 @@ extern int XNeedSignal; #define XUNLOCK #endif /* LOCK_X_UPDATES */ -#ifdef XWINDOW -#ifdef XV11R4 -#undef XV11R1 -#undef XV11R2 -#undef XV11R3 -#endif /* XV11R4 */ - -#ifdef XV11R3 -#undef XV11R1 -#undef XV11R2 -#undef XV11R4 -#endif /* XV11R3 */ - -#ifdef XV11R2 -#undef XV11R1 -#undef XV11R3 -#undef XV11R4 -#endif /* XV11R2 */ - -#ifdef XV11R1 -#undef XV11R2 -#undef XV11R3 -#undef XV11R4 -#endif /* XV11R1 */ - -#if ( !(defined( XV11R1 )) \ - && !(defined( XV11R2 )) \ - && !(defined( XV11R3 )) \ - && !(defined( XV11R4 )) ) -#define XV11R4 /* newest version */ -#endif -#endif /* XWINDOW */ #endif /* XDEFS_H */