diff options
| author | Kim F. Storm | 2003-03-18 23:46:21 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2003-03-18 23:46:21 +0000 |
| commit | 79fa9e0fe078dfbaff0585c49f965fdbb77bf6ba (patch) | |
| tree | edce30b331a5bc25c132bfba81a6a80b3b9e8ff1 /src | |
| parent | de38ae5add03f011d4c4b605601c412597c32161 (diff) | |
| download | emacs-79fa9e0fe078dfbaff0585c49f965fdbb77bf6ba.tar.gz emacs-79fa9e0fe078dfbaff0585c49f965fdbb77bf6ba.zip | |
Fix compilation with --with-x=no.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispextern.h | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 643f76e66cd..00bb2ca0950 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -933,6 +933,8 @@ enum draw_glyphs_face | |||
| 933 | DRAW_IMAGE_SUNKEN | 933 | DRAW_IMAGE_SUNKEN |
| 934 | }; | 934 | }; |
| 935 | 935 | ||
| 936 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 937 | |||
| 936 | /* A sequence of glyphs to be drawn in the same face. */ | 938 | /* A sequence of glyphs to be drawn in the same face. */ |
| 937 | 939 | ||
| 938 | struct glyph_string | 940 | struct glyph_string |
| @@ -1050,6 +1052,7 @@ struct glyph_string | |||
| 1050 | struct glyph_string *next, *prev; | 1052 | struct glyph_string *next, *prev; |
| 1051 | }; | 1053 | }; |
| 1052 | 1054 | ||
| 1055 | #endif /* HAVE_WINDOW_SYSTEM */ | ||
| 1053 | 1056 | ||
| 1054 | 1057 | ||
| 1055 | /************************************************************************ | 1058 | /************************************************************************ |
| @@ -2160,6 +2163,8 @@ struct redisplay_interface | |||
| 2160 | void (*fix_overlapping_area) P_ ((struct window *w, struct glyph_row *row, | 2163 | void (*fix_overlapping_area) P_ ((struct window *w, struct glyph_row *row, |
| 2161 | enum glyph_row_area area)); | 2164 | enum glyph_row_area area)); |
| 2162 | 2165 | ||
| 2166 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 2167 | |||
| 2163 | /* Draw a fringe bitmap in window W of row ROW using parameters P. */ | 2168 | /* Draw a fringe bitmap in window W of row ROW using parameters P. */ |
| 2164 | void (*draw_fringe_bitmap) P_ ((struct window *w, struct glyph_row *row, | 2169 | void (*draw_fringe_bitmap) P_ ((struct window *w, struct glyph_row *row, |
| 2165 | struct draw_fringe_bitmap_params *p)); | 2170 | struct draw_fringe_bitmap_params *p)); |
| @@ -2182,6 +2187,7 @@ struct redisplay_interface | |||
| 2182 | /* Draw a glyph string S. */ | 2187 | /* Draw a glyph string S. */ |
| 2183 | void (*draw_glyph_string) P_ ((struct glyph_string *s)); | 2188 | void (*draw_glyph_string) P_ ((struct glyph_string *s)); |
| 2184 | 2189 | ||
| 2190 | #endif /* HAVE_WINDOW_SYSTEM */ | ||
| 2185 | }; | 2191 | }; |
| 2186 | 2192 | ||
| 2187 | /* The current interface for window-based redisplay. */ | 2193 | /* The current interface for window-based redisplay. */ |
diff --git a/src/xdisp.c b/src/xdisp.c index c8e1ad2df60..20111e4988a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -15665,6 +15665,8 @@ invisible_p (propval, list) | |||
| 15665 | Glyph Display | 15665 | Glyph Display |
| 15666 | ***********************************************************************/ | 15666 | ***********************************************************************/ |
| 15667 | 15667 | ||
| 15668 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 15669 | |||
| 15668 | #if GLYPH_DEBUG | 15670 | #if GLYPH_DEBUG |
| 15669 | 15671 | ||
| 15670 | void | 15672 | void |
| @@ -17647,7 +17649,7 @@ x_produce_glyphs (it) | |||
| 17647 | } | 17649 | } |
| 17648 | 17650 | ||
| 17649 | 17651 | ||
| 17650 | 17652 | #endif /* HAVE_WINDOW_SYSTEM */ | |
| 17651 | 17653 | ||
| 17652 | 17654 | ||
| 17653 | 17655 | ||