Mercurial > emacs
changeset 54442:5755a6bed7a0
xdisp.c (calc_pixel_width_or_height): Add ifdef HAVE_WINDOW_SYSTEM
to compile on non-window system.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Fri, 19 Mar 2004 13:57:08 +0000 |
| parents | 81368dcb68dd |
| children | f4debae4b1d1 |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Mar 19 13:17:16 2004 +0000 +++ b/src/ChangeLog Fri Mar 19 13:57:08 2004 +0000 @@ -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.
--- a/src/xdisp.c Fri Mar 19 13:17:16 2004 +0000 +++ b/src/xdisp.c Fri Mar 19 13:57:08 2004 +0000 @@ -16886,6 +16886,7 @@ if (SYMBOLP (car)) { +#ifdef HAVE_WINDOW_SYSTEM if (valid_image_p (prop)) { int id = lookup_image (it->f, prop); @@ -16893,7 +16894,7 @@ return OK_PIXELS (width_p ? img->width : img->height); } - +#endif if (EQ (car, Qplus) || EQ (car, Qminus)) { int first = 1;