Use FC_DUAL only when it is defined.

diff --git a/src/ChangeLog b/src/ChangeLog
index af76f670e6c488be082aeab4fb764a736b70fc83..8af6bafd90327c6074255d616f4bf73988e633b2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-02  Kenichi Handa  <handa@m17n.org>
+
+       * ftfont.c (ftfont_open): Use FC_DUAL only when it is defined.
+
+       * xftfont.c (xftfont_open): Likewise.
+
 2011-01-29  Andreas Schwab  <schwab@linux-m68k.org>
 
        * image.c (DEF_IMGLIB_FN): Add parameter rettype, use it instead

diff --git a/src/ftfont.c b/src/ftfont.c
index e90a2fc5657ea4a287f4359adf39818a0f6f1c5e..6009bd39537d64bc756c67680bdc21803d3f96a1 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1262,7 +1262,11 @@ ftfont_open (f, entity, pixel_size)
     spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
   else
     spacing = FC_PROPORTIONAL;
-  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
+  if (spacing != FC_PROPORTIONAL
+#ifdef FC_DUAL
+      && spacing != FC_DUAL
+#endif /* FC_DUAL */
+      )
     font->min_width = font->average_width = font->space_width
       = (scalable ? ft_face->max_advance_width * size / upEM
         : ft_face->size->metrics.max_advance >> 6);

diff --git a/src/xftfont.c b/src/xftfont.c
index 35e07da61e382e249c63660684df35bf214af5ad..de2572ce3e69ab15cece51b27c8fabcfc77b1738 100644 (file)
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -430,7 +430,11 @@ xftfont_open (f, entity, pixel_size)
        ascii_printable[i] = ' ' + i;
     }
   BLOCK_INPUT;
-  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
+  if (spacing != FC_PROPORTIONAL
+#ifdef FC_DUAL
+      && spacing != FC_DUAL
+#endif /* FC_DUAL */
+      )
     {
       font->min_width = font->average_width = font->space_width
        = xftfont->max_advance_width;