aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2007-12-03 13:45:14 +0000
committerKenichi Handa2007-12-03 13:45:14 +0000
commit390106219e2fc34f09f4b402e43bac67d9340550 (patch)
tree703fa9193ac33215445c7ec7492d2ec4ff214690
parent49f0a04085104ad2d088da7d1e700278e8af290c (diff)
downloademacs-390106219e2fc34f09f4b402e43bac67d9340550.tar.gz
emacs-390106219e2fc34f09f4b402e43bac67d9340550.zip
(struct glyph_string): Define members clip and
num_clips unconditionally. (struct face): Define members font_info and extra unconditionally.
-rw-r--r--src/dispextern.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index 086d2bffaf6..a4021622ba1 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1221,13 +1221,11 @@ struct glyph_string
1221 *clip_tail, not including their overhangs. */ 1221 *clip_tail, not including their overhangs. */
1222 struct glyph_string *clip_head, *clip_tail; 1222 struct glyph_string *clip_head, *clip_tail;
1223 1223
1224#ifdef USE_FONT_BACKEND
1225 /* The current clipping areas. */ 1224 /* The current clipping areas. */
1226 NativeRectangle clip[2]; 1225 NativeRectangle clip[2];
1227 1226
1228 /* Number of clipping areas. */ 1227 /* Number of clipping areas. */
1229 int num_clips; 1228 int num_clips;
1230#endif /* USE_FONT_BACKEND */
1231 1229
1232 struct glyph_string *next, *prev; 1230 struct glyph_string *next, *prev;
1233}; 1231};
@@ -1485,9 +1483,7 @@ struct face
1485 reallocated. */ 1483 reallocated. */
1486 int font_info_id; 1484 int font_info_id;
1487 1485
1488#ifdef USE_FONT_BACKEND
1489 struct font_info *font_info; 1486 struct font_info *font_info;
1490#endif /* USE_FONT_BACKEND */
1491 1487
1492 /* Fontset ID if for this face's fontset. Non-ASCII faces derived 1488 /* Fontset ID if for this face's fontset. Non-ASCII faces derived
1493 from the same ASCII face have the same fontset. */ 1489 from the same ASCII face have the same fontset. */
@@ -1572,10 +1568,8 @@ struct face
1572 attributes except the font. */ 1568 attributes except the font. */
1573 struct face *ascii_face; 1569 struct face *ascii_face;
1574 1570
1575#ifdef USE_FONT_BACKEND
1576 /* Extra member that a font-driver uses privately. */ 1571 /* Extra member that a font-driver uses privately. */
1577 void *extra; 1572 void *extra;
1578#endif /* USE_FONT_BACKEND */
1579}; 1573};
1580 1574
1581 1575