* ftfont.c (ftfont_otf_capability, ftfont_shape): Omit decls if not needed.

(OTF_TAG_SYM): Omit macro if not needed.

2 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 26833532ca4..6ad69b657b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,8 @@
 2011-03-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         * ftfont.c (ftfont_resolve_generic_family): Fix pointer signedness.
+        (ftfont_otf_capability, ftfont_shape): Omit decls if not needed.
+        (OTF_TAG_SYM): Omit macro if not needed.
 
         * xfont.c (xfont_list_family): Mark var as initialized.
 
diff --git a/src/ftfont.c b/src/ftfont.c
index 0c3e7bb6428..5decec16825 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -491,8 +491,12 @@ static int ftfont_get_bitmap (struct font *, unsigned,
                               struct font_bitmap *, int);
 static int ftfont_anchor_point (struct font *, unsigned, int,
                                 int *, int *);
+#ifdef HAVE_LIBOTF
 static Lisp_Object ftfont_otf_capability (struct font *);
+# ifdef HAVE_M17N_FLT
 static Lisp_Object ftfont_shape (Lisp_Object);
+# endif
+#endif
 
 #ifdef HAVE_OTF_GET_VARIATION_GLYPHS
 static int ftfont_variation_glyphs (struct font *, int c,
@@ -619,6 +623,7 @@ struct OpenTypeSpec
     (P)[4] = '\0';                              \
   } while (0)
 
+#ifdef HAVE_LIBOTF
 #define OTF_TAG_SYM(SYM, TAG)                   \
   do {                                          \
     char str[5];                                \
@@ -626,6 +631,7 @@ struct OpenTypeSpec
     OTF_TAG_STR (TAG, str);                     \
     (SYM) = font_intern_prop (str, 4, 1);       \
   } while (0)
+#endif
 
 
 static struct OpenTypeSpec *