1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 12:40:49 -08:00

xdisp.c (calc_pixel_width_or_height): Add ifdef HAVE_WINDOW_SYSTEM

to compile on non-window system.
This commit is contained in:
Jan Djärv 2004-03-19 13:57:08 +00:00
parent 31da0380c3
commit 992126decd
2 changed files with 7 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2004-03-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* xdisp.c (calc_pixel_width_or_height): Add ifdef HAVE_WINDOW_SYSTEM
to compile on non-window system.
2004-03-19 Kim F. Storm <storm@cua.dk>
* dispextern.h (calc_pixel_width_or_height): Add prototype.

View file

@ -16886,6 +16886,7 @@ calc_pixel_width_or_height (res, it, prop, font, width_p, align_to)
if (SYMBOLP (car))
{
#ifdef HAVE_WINDOW_SYSTEM
if (valid_image_p (prop))
{
int id = lookup_image (it->f, prop);
@ -16893,7 +16894,7 @@ calc_pixel_width_or_height (res, it, prop, font, width_p, align_to)
return OK_PIXELS (width_p ? img->width : img->height);
}
#endif
if (EQ (car, Qplus) || EQ (car, Qminus))
{
int first = 1;