xdisp.c (calc_pixel_width_or_height): Add ifdef HAVE_WINDOW_SYSTEM

to compile on non-window system.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1681e9a144979e33e3b863fa1544f0da1b260259..b7e373ac2958bf3376b9f8ec52ccb9b2c18e78a9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-19  Jan Dj\e,Ad\e(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.

diff --git a/src/xdisp.c b/src/xdisp.c
index 1ba274d13125467695a429045f216edb07a2259f..cf8ca02bc10287ff7e76b790948f393fb6f6f217 100644 (file)
--- 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)
 
       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;