Mercurial > emacs
changeset 98656:f2f525a089e1
* ftfont.c (ftfont_shape_by_flt): Make static.
* ftfont.h (ftfont_shape_by_flt): Don't declare.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Sun, 12 Oct 2008 12:50:00 +0000 |
| parents | 29b77fe23d01 |
| children | 3780bdf31ec4 |
| files | src/ChangeLog src/ftfont.c src/ftfont.h |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Oct 12 12:49:14 2008 +0000 +++ b/src/ChangeLog Sun Oct 12 12:50:00 2008 +0000 @@ -1,5 +1,8 @@ 2008-10-12 Andreas Schwab <schwab@suse.de> + * ftfont.c (ftfont_shape_by_flt): Make static. + * ftfont.h (ftfont_shape_by_flt): Don't declare. + * font.c: Don't include <m17n-flt.h>. 2008-10-10 Eli Zaretskii <eliz@gnu.org>
--- a/src/ftfont.c Sun Oct 12 12:49:14 2008 +0000 +++ b/src/ftfont.c Sun Oct 12 12:50:00 2008 +0000 @@ -1803,7 +1803,7 @@ extern Lisp_Object QCfamily; -Lisp_Object +static Lisp_Object ftfont_shape_by_flt (lgstring, font, ft_face, otf) Lisp_Object lgstring; struct font *font;
--- a/src/ftfont.h Sun Oct 12 12:49:14 2008 +0000 +++ b/src/ftfont.h Sun Oct 12 12:50:00 2008 +0000 @@ -33,10 +33,8 @@ #include <otf.h> #ifdef HAVE_M17N_FLT #include <m17n-flt.h> -extern Lisp_Object ftfont_shape_by_flt P_ ((Lisp_Object, struct font *, - FT_Face, OTF *)); +#endif /* HAVE_M17N_FLT */ #endif /* HAVE_LIBOTF */ -#endif /* HAVE_M17N_FLT */ #endif /* EMACS_FTFONT_H */