From: Kenichi Handa <handa@m17n.org>
Date: Mon, 30 Mar 2009 05:39:01 +0000 (+0000)
Subject: Fix previous change.  Define ftfont_variation_glyphs
X-Git-Tag: emacs-pretest-23.0.92~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e386973195212656d80a767e7fc0afb1baf6a75f;p=emacs.git

Fix previous change.  Define ftfont_variation_glyphs
even if HAVE_M17N_FLT is not defined.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b5bb58bf44b..2b743f6176f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-30  Kenichi Handa  <handa@m17n.org>
+
+	* ftfont.c: Fix previous change.  Define ftfont_variation_glyphs
+	even if HAVE_M17N_FLT is not defined.
+
 2009-03-29  Sebastian Rose  <sebastian_rose@gmx.de>  (tiny change)
 
 	* ftfont.c: Conditionalize prototyping and use of
diff --git a/src/ftfont.c b/src/ftfont.c
index 33fb9b455a6..aa9777acf34 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -382,14 +382,10 @@ static int ftfont_anchor_point P_ ((struct font *, unsigned, int,
 static Lisp_Object ftfont_otf_capability P_ ((struct font *));
 static Lisp_Object ftfont_shape P_ ((Lisp_Object));
 
-#ifdef HAVE_LIBOTF
-#ifdef HAVE_M17N_FLT
 #ifdef HAVE_OTF_GET_VARIATION_GLYPHS
 static int ftfont_variation_glyphs P_ ((struct font *, int c,
 					unsigned variations[256]));
 #endif /* HAVE_OTF_GET_VARIATION_GLYPHS */
-#endif /* HAVE_M17N_FLT */
-#endif /* HAVE_LIBOTF */
 
 struct font_driver ftfont_driver =
   {
@@ -430,7 +426,7 @@ struct font_driver ftfont_driver =
 #endif	/* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
     NULL,			/* check */
 
-#if defined (HAVE_LIBOTF) && defined (HAVE_M17N_FLT) && defined (HAVE_OTF_GET_VARIATION_GLYPHS)
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
     ftfont_variation_glyphs
 #else
     NULL
@@ -2023,6 +2019,8 @@ ftfont_shape (lgstring)
   return ftfont_shape_by_flt (lgstring, font, ftfont_info->ft_size->face, otf);
 }
 
+#endif	/* HAVE_M17N_FLT */
+
 #ifdef HAVE_OTF_GET_VARIATION_GLYPHS
 
 static int
@@ -2040,7 +2038,6 @@ ftfont_variation_glyphs (font, c, variations)
 }
 
 #endif	/* HAVE_OTF_GET_VARIATION_GLYPHS */
-#endif	/* HAVE_M17N_FLT */
 #endif	/* HAVE_LIBOTF */
 
 Lisp_Object