wdvi

network DVI viewer
Log | Files | Refs

commit 821566c81a35817120c1e390c51a39f60e9b9946
parent e49799918d298759fc079a5a2d21f85baad25c59
Author: Kyle Milz <krwmilz@gmail.com>
Date:   Mon, 16 Aug 2021 16:50:25 +0000

XlibSpecificationRelease is 6

Diffstat:
Mxdvi.c | 14--------------
Mxdvi.h | 3---
2 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/xdvi.c b/xdvi.c @@ -167,11 +167,6 @@ typedef struct _LateBindings { # endif /* HAVE_X11_INTRINSICI_H */ -#if XlibSpecificationRelease < 5 -typedef char *XPointer; -#define XScreenNumberOfScreen(s) ((s) - ScreenOfDisplay(DISP, 0)) -#endif - /* * Cursors and masks for dragging operations. */ @@ -1829,16 +1824,7 @@ or invalid argument:\n\t\"%s\", \"%s\".", /* Check early for whether to pass off to a different xdvi process * (-sourceposition argument for reverse source special lookup). */ -#if XlibSpecificationRelease >= 6 if (!XInternAtoms(DISP, atom_names, XtNumber(atom_names), False, atoms)) -#else - if ((atoms[0] = XInternAtom(DISP, atom_names[0], False)) == None - || (atoms[1] = XInternAtom(DISP, atom_names[1], False)) == None - || (atoms[2] = XInternAtom(DISP, atom_names[2], False)) == None - || (atoms[3] = XInternAtom(DISP, atom_names[3], False)) == None - || (atoms[4] = XInternAtom(DISP, atom_names[4], False)) == None - ) -#endif oops("XInternAtoms failed."); if (debug & DBG_CLIENT) { diff --git a/xdvi.h b/xdvi.h @@ -68,10 +68,7 @@ NOTE: #include <X11/Xlib.h> /* include Xfuncs.h, if available */ #include <X11/Xutil.h> /* needed for XDestroyImage */ #include <X11/Xos.h> - -#if XlibSpecificationRelease >= 5 #include <X11/Xfuncs.h> -#endif #include <X11/Intrinsic.h>