From: Dave Love <fx@gnu.org>
Date: Fri, 23 Jun 2000 14:37:24 +0000 (+0000)
Subject: Include fontset.h dependent on HAVE_WINDOW_SYSTEM, not HAVE_X_WINDOWS.
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/f7cc6849e5fbb2d15b99ef90fcfceaac8b810ef4?hp=874e20d39513348be7025b29bc5d7fa3661ac90f

Include fontset.h dependent on HAVE_WINDOW_SYSTEM, not HAVE_X_WINDOWS.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 44f47b88e3..6299d80809 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -193,9 +193,11 @@ Boston, MA 02111-1307, USA.  */
 #include "charset.h"
 #include "frame.h"
 
+#ifdef HAVE_WINDOW_SYSTEM
+#include "fontset.h"
+#endif
 #ifdef HAVE_X_WINDOWS
 #include "xterm.h"
-#include "fontset.h"
 #ifdef USE_MOTIF
 #include <Xm/Xm.h>
 #include <Xm/XmStrDefs.h>
@@ -3964,6 +3966,8 @@ DEFUN ("internal-set-lisp-face-attribute-from-resource",
 
 #ifdef USE_X_TOOLKIT
 
+#include "../lwlib/lwlib-utils.h"
+
 /* Structure used to pass X resources to functions called via
    XtApplyToWidgets.  */