* xftfont.c (xftfont_shape): Now static, and defined only if needed.

diff --git a/src/ChangeLog b/src/ChangeLog
index ec9f513b045ddc79fca3b01d707ec3a15d32e659..ef0999b845479e9db9b04d7218842b218c4d8dbf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-19  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xftfont.c (xftfont_shape): Now static, and defined only if needed.
+
        * 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.

diff --git a/src/xftfont.c b/src/xftfont.c
index 695527c4236832ba2f81b854b36e8673cec973aa..7c8b5dde070263b53aa54f554b2c131e35aa7486 100644 (file)
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -672,7 +672,8 @@ xftfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_b
   return len;
 }
 
-Lisp_Object
+#if defined HAVE_M17N_FLT && defined HAVE_LIBOTF
+static Lisp_Object
 xftfont_shape (Lisp_Object lgstring)
 {
   struct font *font;
@@ -688,6 +689,7 @@ xftfont_shape (Lisp_Object lgstring)
   XftUnlockFace (xftfont_info->xftfont);
   return val;
 }
+#endif
 
 static int
 xftfont_end_for_frame (FRAME_PTR f)