From 0248044d313959dd87d64438fa297ca25adfc9ac Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 18 Mar 2011 22:05:19 -0700 Subject: * xftfont.c (xftfont_shape): Now static, and defined only if needed. --- src/ChangeLog | 2 ++ src/xftfont.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index ec9f513b04..ef0999b845 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-03-19 Paul Eggert + * 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 695527c423..7c8b5dde07 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) -- cgit v1.2.3