2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index b4871bd8910..d959c2ade4a 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -1,3 +1,8 @@
+2007-12-03  Kenichi Handa  <handa@ni.aist.go.jp>
+
+        * ftfont.c (ftfont_open): Set members maybe_otf and otf of
+        ftfont_info only when HAVE_LIBOTF is defined.
+
 2007-12-02  Andreas Schwab  <schwab@suse.de>
 
         * xdisp.c (back_to_previous_visible_line_start): Fix type of beg
diff --git a/src/xftfont.c b/src/xftfont.c
index 361c2ace83f..51049b81985 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -54,7 +54,7 @@ struct xftfont_info
 #ifdef HAVE_LIBOTF
   int maybe_otf;          /* Flag to tell if this may be OTF or not.  */
   OTF *otf;
-#endif
+#endif  /* HAVE_LIBOTF */
 };
 
 /* Structure pointed by (struct face *)->extra  */
@@ -273,7 +273,7 @@ xftfont_open (f, entity, pixel_size)
 #ifdef HAVE_LIBOTF
   xftfont_info->maybe_otf = xftfont_info->ft_face->face_flags & FT_FACE_FLAG_SFNT;
   xftfont_info->otf = NULL;
-#endif
+#endif  /* HAVE_LIBOTF */
 
   font = (struct font *) xftfont_info;
   font->format = ftfont_font_format (xftfont->pattern);