wdvi

commit e0721839a3144decd3bef7da9901556f440a095b
parent fd190001d41b79a2a72a71c39bf29cb1f3ca4f72
Author: Kyle Milz <krwmilz@gmail.com>
Date:   Thu, 19 Aug 2021 17:18:07 +0000

assume OLD_X11_TOOLKIT is false

Diffstat:
M
events.c
 | 
14
+++-----------
M
xdvi.c
 | 
10
+---------

2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/events.c b/events.c
@@ -31,22 +31,14 @@ NOTE:
 #include <ctype.h>
 
 /* Xlib and Xutil are already included */
-
-
-#ifdef	OLD_X11_TOOLKIT
-#include <X11/Atoms.h>
-#else /* not OLD_X11_TOOLKIT */
 #include <X11/Xatom.h>
 #include <X11/StringDefs.h>
-#endif /* not OLD_X11_TOOLKIT */
-
 #include <X11/Shell.h>	/* needed for def. of XtNiconX */
-
-
-#  include <X11/Xaw/Viewport.h>
-# include <X11/cursorfont.h>
+#include <X11/cursorfont.h>
 #include <X11/IntrinsicI.h>	/* _XtComputeLateBindings */
 
+#include <X11/Xaw/Viewport.h>
+
 #ifdef	BUTTONS
 #  include <X11/Xaw/Command.h>
 #define	PANEL_WIDGET_CLASS	compositeWidgetClass
diff --git a/xdvi.c b/xdvi.c
@@ -117,23 +117,15 @@ static	char	copyright[] UNUSED =
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include "xdvi.icon"
-
-
-#ifdef	OLD_X11_TOOLKIT
-#include <X11/Atoms.h>
-#else /* not OLD_X11_TOOLKIT */
 #include <X11/Xatom.h>
 #include <X11/StringDefs.h>
-#endif /* not OLD_X11_TOOLKIT */
-
 #include <X11/Shell.h>	/* needed for def. of XtNiconX */
+#include <X11/IntrinsicI.h>
 
 #include <X11/Xaw/Viewport.h>
 #include <X11/Xaw/AsciiText.h>
 #include <X11/Xaw/Command.h>
 
-#include <X11/IntrinsicI.h>
-
 
 /*
  *	Cursors and masks for dragging operations.