Mercurial > emacs
changeset 91167:d56477e18a66
(struct glyph_string): Define members clip and
num_clips unconditionally.
(struct face): Define members font_info and extra unconditionally.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 03 Dec 2007 13:45:14 +0000 |
| parents | 953742775bea |
| children | 4323f9b78ae1 |
| files | src/dispextern.h |
| diffstat | 1 files changed, 0 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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 */ };