# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 989661239 0
# Node ID 0e6b93106f2a7ea901648e789e8ce1bfca5fdcc0
# Parent  a76348c096b429b70e09f5910c02c8a264318f1a
Include keyboard.h before frame.h, not after it.

diff -r a76348c096b4 -r 0e6b93106f2a src/xfaces.c
--- a/src/xfaces.c	Sat May 12 09:52:18 2001 +0000
+++ b/src/xfaces.c	Sat May 12 09:53:59 2001 +0000
@@ -196,6 +196,7 @@
 #include <sys/stat.h>
 #include "lisp.h"
 #include "charset.h"
+#include "keyboard.h"
 #include "frame.h"
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -219,6 +220,7 @@
 #include "fontset.h"
 /* Redefine X specifics to W32 equivalents to avoid cluttering the
    code with #ifdef blocks. */
+#undef FRAME_X_DISPLAY_INFO
 #define FRAME_X_DISPLAY_INFO FRAME_W32_DISPLAY_INFO
 #define x_display_info w32_display_info
 #define FRAME_X_FONT_TABLE FRAME_W32_FONT_TABLE
@@ -227,6 +229,7 @@
 #define GCGraphicsExposures 0
 /* For historic reasons, FONT_WIDTH refers to average width on W32,
    not maximum as on X. Redefine here. */
+#undef FONT_WIDTH
 #define FONT_WIDTH FONT_MAX_WIDTH
 #endif /* WINDOWSNT */
 
@@ -284,7 +287,6 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include "keyboard.h"
 
 #ifndef max
 #define max(A, B)	((A) > (B) ? (A) : (B))