From: Geoff Voelker <voelker@cs.washington.edu>
Date: Wed, 29 Apr 1998 04:34:05 +0000 (+0000)
Subject: Conditionally include xterm.h using HAVE_X_WINDOWS.
X-Git-Tag: emacs-20.3~1252
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6d55d620a61d672067cdcd5880968606f9d9cf27;p=emacs.git

Conditionally include xterm.h using HAVE_X_WINDOWS.
---

diff --git a/src/frame.c b/src/frame.c
index cb597b0c614..7d461089471 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -28,6 +28,8 @@ Boston, MA 02111-1307, USA.  */
 #include "charset.h"
 #ifdef HAVE_WINDOW_SYSTEM
 #include "fontset.h"
+#endif
+#ifdef HAVE_X_WINDOWS
 #include "xterm.h"
 #endif
 #include "frame.h"
diff --git a/src/window.c b/src/window.c
index 1f4815eba3e..e4ba54a4c68 100644
--- a/src/window.c
+++ b/src/window.c
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.  */
 #include "keyboard.h"
 #include "blockinput.h"
 #include "dispextern.h"
-#ifdef HAVE_WINDOW_SYSTEM
+#ifdef HAVE_X_WINDOWS
 #include "xterm.h"
 #endif
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 6419c5b3aa0..2ac8e7d45b4 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -42,7 +42,7 @@ Boston, MA 02111-1307, USA.  */
 #include "process.h"
 #include "region-cache.h"
 
-#ifdef HAVE_WINDOW_SYSTEM
+#ifdef HAVE_X_WINDOWS
 #include "xterm.h"
 #endif