]> git.eshelyaron.com Git - emacs.git/commitdiff
Conditionalize prototyping and use of ftfont_variation_glyphs.
authorChong Yidong <cyd@stupidchicken.com>
Sun, 29 Mar 2009 17:12:26 +0000 (17:12 +0000)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 29 Mar 2009 17:12:26 +0000 (17:12 +0000)
src/ftfont.c

index b8c39cd920d41db56e9e21cbafab380419929dc1..33fb9b455a674f3bfc5663d89c96ce06e9611027 100644 (file)
@@ -381,8 +381,15 @@ static int ftfont_anchor_point P_ ((struct font *, unsigned, int,
                                    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 @@ struct font_driver ftfont_driver =
     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