HAVE_NTGUI] (struct frame_glyphs): Include pixel fields.
Use HAVE_WINDOW_SYSTEM instead of testing for specific window systems.
#include "msdos.h"
#endif
+#ifdef HAVE_NTGUI
+#include "win32.h"
+#endif
+
#ifdef HAVE_FACES
struct face
{
and should be deleted. */
int *bufp;
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
/* Pixel position of top left corner of line. */
short *top_left_x;
short *top_left_y;
/* Largest font ascent on this line. */
short *max_ascent;
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
/* Mapping of coordinate pairs to buffer positions.
This field holds a vector indexed by row number.