diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-18 22:05:19 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-18 22:05:19 -0700 |
| commit | 0248044d313959dd87d64438fa297ca25adfc9ac (patch) | |
| tree | 6268c797dcac1e79c7bad0e513cb286a4304e224 | |
| parent | 49eaafbac1695d9244329b3518309bfcc1a98aa4 (diff) | |
| download | emacs-0248044d313959dd87d64438fa297ca25adfc9ac.tar.gz | |
* xftfont.c (xftfont_shape): Now static, and defined only if needed.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xftfont.c | 4 |
2 files changed, 5 insertions, 1 deletions
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) |