aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2004-03-19 13:57:08 +0000
committerJan Djärv2004-03-19 13:57:08 +0000
commit992126decd80d366685c7c8adda3bf3f14a8d226 (patch)
tree9377842d55a84aaeb8ca862f51cd5b29e39c4d9e
parent31da0380c3a405a17301eda125f0a573695d15ed (diff)
downloademacs-992126decd80d366685c7c8adda3bf3f14a8d226.tar.gz
emacs-992126decd80d366685c7c8adda3bf3f14a8d226.zip
xdisp.c (calc_pixel_width_or_height): Add ifdef HAVE_WINDOW_SYSTEM
to compile on non-window system.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1681e9a1449..b7e373ac295 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12004-03-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xdisp.c (calc_pixel_width_or_height): Add ifdef HAVE_WINDOW_SYSTEM
4 to compile on non-window system.
5
12004-03-19 Kim F. Storm <storm@cua.dk> 62004-03-19 Kim F. Storm <storm@cua.dk>
2 7
3 * dispextern.h (calc_pixel_width_or_height): Add prototype. 8 * dispextern.h (calc_pixel_width_or_height): Add prototype.
diff --git a/src/xdisp.c b/src/xdisp.c
index 1ba274d1312..cf8ca02bc10 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16886,6 +16886,7 @@ calc_pixel_width_or_height (res, it, prop, font, width_p, align_to)
16886 16886
16887 if (SYMBOLP (car)) 16887 if (SYMBOLP (car))
16888 { 16888 {
16889#ifdef HAVE_WINDOW_SYSTEM
16889 if (valid_image_p (prop)) 16890 if (valid_image_p (prop))
16890 { 16891 {
16891 int id = lookup_image (it->f, prop); 16892 int id = lookup_image (it->f, prop);
@@ -16893,7 +16894,7 @@ calc_pixel_width_or_height (res, it, prop, font, width_p, align_to)
16893 16894
16894 return OK_PIXELS (width_p ? img->width : img->height); 16895 return OK_PIXELS (width_p ? img->width : img->height);
16895 } 16896 }
16896 16897#endif
16897 if (EQ (car, Qplus) || EQ (car, Qminus)) 16898 if (EQ (car, Qplus) || EQ (car, Qminus))
16898 { 16899 {
16899 int first = 1; 16900 int first = 1;