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 @@
+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.
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)
 
       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;