Skip to content

Remove XV11R4 and related defines. #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 22, 2020
Merged

Remove XV11R4 and related defines. #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions bin/makefile-darwin.386-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-darwin.aarch64-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-darwin.x86_64-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-freebsd.386-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-init.386
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-init.sparc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-linux.386-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-linux.armv7l-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-linux.x86_64-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-sunos3.mc68020-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-sunos4.1.mc68020-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-sunos4.1.sparc-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-sunos4.mc68020-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-sunos4.sparc-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-sunos4.sparc-x-3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-sunos5.386-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-sunos5.i386-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-sunos5.sparc-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-sunos5.x86_64-x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 0 additions & 32 deletions inc/xdefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */