(FRAME_LINE_HEIGHT, FRAME_DEFAULT_FONT_WIDTH): Define if not defined.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3492a48c36078b00238b88d9d6dae883e15f9f32..f8ed02b07cc3360f5b947f634170fce6b6b6f440 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-22  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * frame.h (FRAME_LINE_HEIGHT, FRAME_DEFAULT_FONT_WIDTH):
+       Define if not defined.
+
 2005-03-04  Thien-Thi Nguyen  <ttn@gnu.org>
 
        * s/vms.h: Define NO_HYPHENS_IN_FILENAMES.

diff --git a/src/frame.h b/src/frame.h
index 633199809e99a0a1d066d9997da82f9b6d2c6f73..b1202cc7d46e230f48b49def4b14e62cb254e142 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -706,7 +706,15 @@ extern Lisp_Object selected_frame;
 
 /* Canonical y-unit on frame F.  This value currently equals the line
    height of the frame.  Terminal specific header files are expected
-   to define the macro FRAME_LINE_HEIGHT.  */
+   to define the macro FRAME_LINE_HEIGHT.  Buf if they do not, that's
+   fine, as well.  */
+
+#ifndef FRAME_LINE_HEIGHT
+#define FRAME_LINE_HEIGHT(x)  0
+#endif
+#ifndef FRAME_DEFAULT_FONT_WIDTH
+#define FRAME_DEFAULT_FONT_WIDTH(x)  0
+#endif
 
 #define CANON_Y_UNIT(F) \
      (FRAME_WINDOW_P (F) ? FRAME_LINE_HEIGHT (F) : 1)