diff options
| author | Geoff Voelker | 1995-11-07 07:13:46 +0000 |
|---|---|---|
| committer | Geoff Voelker | 1995-11-07 07:13:46 +0000 |
| commit | 497fbd42da3c4f7f98e3c02c853f17459883a279 (patch) | |
| tree | 866428c39d0e08719929866c5171ce6eb3ffa29b /src | |
| parent | bb7e0f816e461c7751828375a8090a21ce2c9258 (diff) | |
| download | emacs-497fbd42da3c4f7f98e3c02c853f17459883a279.tar.gz emacs-497fbd42da3c4f7f98e3c02c853f17459883a279.zip | |
[HAVE_NTGUI]: Include win32.h.
HAVE_NTGUI] (struct frame_glyphs): Include pixel fields.
Use HAVE_WINDOW_SYSTEM instead of testing for specific window systems.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispextern.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index d62797195ca..98fefbc4de9 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -32,6 +32,10 @@ extern int display_completed; | |||
| 32 | #include "msdos.h" | 32 | #include "msdos.h" |
| 33 | #endif | 33 | #endif |
| 34 | 34 | ||
| 35 | #ifdef HAVE_NTGUI | ||
| 36 | #include "win32.h" | ||
| 37 | #endif | ||
| 38 | |||
| 35 | #ifdef HAVE_FACES | 39 | #ifdef HAVE_FACES |
| 36 | struct face | 40 | struct face |
| 37 | { | 41 | { |
| @@ -127,7 +131,7 @@ struct frame_glyphs | |||
| 127 | and should be deleted. */ | 131 | and should be deleted. */ |
| 128 | int *bufp; | 132 | int *bufp; |
| 129 | 133 | ||
| 130 | #ifdef HAVE_X_WINDOWS | 134 | #ifdef HAVE_WINDOW_SYSTEM |
| 131 | /* Pixel position of top left corner of line. */ | 135 | /* Pixel position of top left corner of line. */ |
| 132 | short *top_left_x; | 136 | short *top_left_x; |
| 133 | short *top_left_y; | 137 | short *top_left_y; |
| @@ -140,7 +144,7 @@ struct frame_glyphs | |||
| 140 | 144 | ||
| 141 | /* Largest font ascent on this line. */ | 145 | /* Largest font ascent on this line. */ |
| 142 | short *max_ascent; | 146 | short *max_ascent; |
| 143 | #endif /* HAVE_X_WINDOWS */ | 147 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 144 | 148 | ||
| 145 | /* Mapping of coordinate pairs to buffer positions. | 149 | /* Mapping of coordinate pairs to buffer positions. |
| 146 | This field holds a vector indexed by row number. | 150 | This field holds a vector indexed by row number. |