Mercurial > emacs
changeset 37700:0e6b93106f2a
Include keyboard.h before frame.h, not after it.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 12 May 2001 09:53:59 +0000 |
| parents | a76348c096b4 |
| children | bc25122cbfe4 |
| files | src/xfaces.c |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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))