[Emacs-diffs] emacs/src ftfont.c

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/03/30 05:38:51

Modified files:
        src            : ftfont.c 

Log message:
        Fix previous change.  Define ftfont_variation_glyphs
        even if HAVE_M17N_FLT is not defined.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ftfont.c?cvsroot=emacs&r1=1.46&r2=1.47

Patches:
Index: ftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ftfont.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- ftfont.c    29 Mar 2009 17:12:26 -0000      1.46
+++ ftfont.c    30 Mar 2009 05:38:51 -0000      1.47
@@ -382,14 +382,10 @@
 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 @@
 #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 @@
   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 @@
 }
 
 #endif /* HAVE_OTF_GET_VARIATION_GLYPHS */
-#endif /* HAVE_M17N_FLT */
 #endif /* HAVE_LIBOTF */
 
 Lisp_Object