summaryrefslogtreecommitdiff
path: root/src/fontset.c
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2013-09-05 16:08:50 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2013-09-05 16:08:50 +0400
commit667383058ff503073f9e094ab3c88280748857ef (patch)
treea7414a0db692cdc8aad04dd9919478f8a94ea0f7 /src/fontset.c
parent6aed5dccd0b87e6c32345b4914dcb50eea399327 (diff)
downloademacs-667383058ff503073f9e094ab3c88280748857ef.tar.gz
* fontset.c, window.c, xdisp.c (toplevel): Use TERM_HEADER.
* xfaces.c (toplevel) [HAVE_X_WINDOWS]: Do not include xterm.h twice.
Diffstat (limited to 'src/fontset.c')
-rw-r--r--src/fontset.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/fontset.c b/src/fontset.c
index a6277b050d5..797d51ac0a7 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -39,17 +39,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "intervals.h"
#include "fontset.h"
#include "window.h"
-#ifdef HAVE_X_WINDOWS
-#include "xterm.h"
-#endif
-#ifdef HAVE_NTGUI
-#include "w32term.h"
-#endif
-#ifdef HAVE_NS
-#include "nsterm.h"
-#endif
+#ifdef HAVE_WINDOW_SYSTEM
+#include TERM_HEADER
+#endif /* HAVE_WINDOW_SYSTEM */
#include "termhooks.h"
-
#include "font.h"
/* FONTSET