From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 19 Mar 2011 05:05:19 +0000 (-0700)
Subject: * xftfont.c (xftfont_shape): Now static, and defined only if needed.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~513^2~34
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0248044d313959dd87d64438fa297ca25adfc9ac;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index ec9f513b045..ef0999b8454 100644
--- 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 695527c4236..7c8b5dde070 100644
--- 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)