# HG changeset patch # User Kenichi Handa # Date 1196689514 0 # Node ID d56477e18a6636dbcee6f8f4b78b923a4e2ed9cb # Parent 953742775bea468085750bfa97f5d43f51373456 (struct glyph_string): Define members clip and num_clips unconditionally. (struct face): Define members font_info and extra unconditionally. diff -r 953742775bea -r d56477e18a66 src/dispextern.h --- a/src/dispextern.h Mon Dec 03 13:42:48 2007 +0000 +++ b/src/dispextern.h Mon Dec 03 13:45:14 2007 +0000 @@ -1221,13 +1221,11 @@ *clip_tail, not including their overhangs. */ struct glyph_string *clip_head, *clip_tail; -#ifdef USE_FONT_BACKEND /* The current clipping areas. */ NativeRectangle clip[2]; /* Number of clipping areas. */ int num_clips; -#endif /* USE_FONT_BACKEND */ struct glyph_string *next, *prev; }; @@ -1485,9 +1483,7 @@ reallocated. */ int font_info_id; -#ifdef USE_FONT_BACKEND struct font_info *font_info; -#endif /* USE_FONT_BACKEND */ /* Fontset ID if for this face's fontset. Non-ASCII faces derived from the same ASCII face have the same fontset. */ @@ -1572,10 +1568,8 @@ attributes except the font. */ struct face *ascii_face; -#ifdef USE_FONT_BACKEND /* Extra member that a font-driver uses privately. */ void *extra; -#endif /* USE_FONT_BACKEND */ };