Mercurial > emacs

diff src/ftfont.c @ 102773:b9b8c6b17d2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Conditionalize prototyping and use of ftfont_variation_glyphs.
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 29 Mar 2009 17:12:26 +0000
parents 97c9e9322753
children 9874a0083028
line wrap: on
line diff
--- a/src/ftfont.c	Sun Mar 29 17:12:10 2009 +0000
+++ b/src/ftfont.c	Sun Mar 29 17:12:26 2009 +0000
@@ -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