[Emacs-diffs] emacs/src ftfont.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/03/29 17:12:27

Modified files:
        src            : ftfont.c 

Log message:
        Conditionalize prototyping and use of ftfont_variation_glyphs.

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

Patches:
Index: ftfont.c
===================================================================
RCS file: /sources/emacs/emacs/src/ftfont.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- ftfont.c    11 Feb 2009 09:45:14 -0000      1.45
+++ ftfont.c    29 Mar 2009 17:12:26 -0000      1.46
@@ -381,8 +381,15 @@
                                    int *, 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 =
   {
@@ -422,7 +429,8 @@
     NULL,
 #endif /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
     NULL,                      /* check */
-#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
+
+#if defined (HAVE_LIBOTF) && defined (HAVE_M17N_FLT) && defined 
(HAVE_OTF_GET_VARIATION_GLYPHS)
     ftfont_variation_glyphs
 #else
     NULL