From 7a24b41fc4f2976a98c9c4da5bf3cd1f51737b9c Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Tue, 19 Jan 2021 14:45:59 +0700
Subject: [PATCH] Fix !XWINDOW to be SUNDISPLAY ifdefery. (#234)

Some of the `ifndef XWINDOW` code should have been
`ifdef SUNDISPLAY` instead.
---
 src/bbtsub.c   |  7 ++-----
 src/kbdsubrs.c |  4 ++--
 src/keyevent.c | 11 +++++------
 src/uraid.c    |  7 +------
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/bbtsub.c b/src/bbtsub.c
index a6c2cf1..1e63cf0 100644
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -36,15 +36,12 @@
 #include "xdefs.h"
 #endif /* XWINDOW */
 
-#ifndef XWINDOW
+#ifdef SUNDISPLAY
 #ifndef NOPIXRECT
-#ifndef DOS
 #include <sunwindow/window_hs.h>
 #include <sunwindow/win_ioctl.h>
-#endif /* DOS */
 #endif /* NOPIXRECT */
-
-#endif /* XWINDOW */
+#endif /* SUNDISPLAY */
 
 #include "lispemul.h"
 #include "lspglob.h"
diff --git a/src/kbdsubrs.c b/src/kbdsubrs.c
index c8181ee..988af76 100644
--- a/src/kbdsubrs.c
+++ b/src/kbdsubrs.c
@@ -59,9 +59,9 @@ extern DspInterface currentdsp;
  *
  ****************************************************/
 
-#ifndef XWINDOW
+#ifdef SUNDISPLAY
 extern struct screen LispScreen;
-#endif /* XWINDOW */
+#endif /* SUNDISPLAY */
 
 #ifdef XWINDOW
 #include <X11/Xlib.h>
diff --git a/src/keyevent.c b/src/keyevent.c
index 27d4086..50b8cb4 100644
--- a/src/keyevent.c
+++ b/src/keyevent.c
@@ -38,8 +38,7 @@
 void Mouse_hndlr(void); /* Fields mouse events from driver        */
                         /*  (during servicing of mouse interrupt) */
 
-#elif XWINDOW
-#else
+#elif SUNDISPLAY
 #include <sunwindow/window_hs.h>
 #include <sunwindow/win_ioctl.h>
 #include <suntool/window.h>
@@ -277,9 +276,9 @@ DLword ColorCursor_savebitmap[CURSORWIDTH / COLORPIXELS_IN_DLWORD * CURSORHEIGHT
 void getsignaldata(int sig)
 {
 #ifndef DOS
-#ifndef XWINDOW
+#ifdef SUNDISPLAY
   struct inputevent event;
-#endif /* XWINDOW */
+#endif /* SUNDISPLAY */
   fd_set rfds, efds;
   u_int iflags;
   int i;
@@ -374,6 +373,7 @@ getmore:
 #endif /* DOS */
 } /* end getsignaldata */
 
+#ifdef SUNDISPLAY
 /************************************************************************/
 /*									*/
 /*			    k b _ e v e n t				*/
@@ -382,7 +382,6 @@ getmore:
 /*	occurred, 0 if one didn't occur.				*/
 /*									*/
 /************************************************************************/
-#if (!defined(XWINDOW) && !defined(DOS))
 extern int for_makeinit;
 
 int kb_event(struct inputevent *event);
@@ -499,7 +498,7 @@ int kb_event(struct inputevent *event);
   } /* if *EmRealUtilin68K end */
   return (1);
 }
-#endif /* neither XWINDOW nor DOS*/
+#endif /* SUNDISPLAY */
 
 /************************************************************************/
 /*									*/
diff --git a/src/uraid.c b/src/uraid.c
index 70bf773..10cae29 100644
--- a/src/uraid.c
+++ b/src/uraid.c
@@ -35,11 +35,9 @@
 #include <sys/select.h>
 #endif /* DOS */
 
-#ifndef XWINDOW
 #ifdef SUNDISPLAY
 #include <sundev/kbd.h>
 #include <sundev/kbio.h>
-#endif /* SUNDISPLAY */
 #include <errno.h>
 #ifndef NOPIXRECT
 #include <sunwindow/window_hs.h>
@@ -48,12 +46,9 @@
 #include <sunwindow/win_cursor.h>
 #include <sunwindow/cms.h>
 #include <sys/mman.h>
-#ifdef SUNDISPLAY
 extern int Win_security_p;
-#endif /* SUNDISPLAY */
-
 #endif /* NOPIXRECT */
-#endif /* XWINDOW */
+#endif /* SUNDISPLAY */
 
 #ifdef OS5
 #include <stropts.h>