diff options
| author | Andreas Schwab <schwab@suse.de> | 2008-10-12 12:50:00 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2008-10-12 12:50:00 +0000 |
| commit | 990a73f04944decbcaf330c60ae3557b5a84ceca (patch) | |
| tree | d0c2e71dab3e7337e481800033fbe2af482bf1f0 | |
| parent | f6d52a3393b96613cadfd0010a1ce2123678526c (diff) | |
| download | emacs-990a73f04944decbcaf330c60ae3557b5a84ceca.tar.gz | |
* ftfont.c (ftfont_shape_by_flt): Make static.
* ftfont.h (ftfont_shape_by_flt): Don't declare.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/ftfont.c | 2 | ||||
| -rw-r--r-- | src/ftfont.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 871a2d36210..2118e4959d9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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> diff --git a/src/ftfont.c b/src/ftfont.c index b81a066a164..da2760a7891 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -1803,7 +1803,7 @@ static int m17n_flt_initialized; extern Lisp_Object QCfamily; -Lisp_Object +static Lisp_Object ftfont_shape_by_flt (lgstring, font, ft_face, otf) Lisp_Object lgstring; struct font *font; diff --git a/src/ftfont.h b/src/ftfont.h index 6a1ca92f4d8..02156cba326 100644 --- a/src/ftfont.h +++ b/src/ftfont.h @@ -33,10 +33,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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_LIBOTF */ #endif /* HAVE_M17N_FLT */ +#endif /* HAVE_LIBOTF */ #endif /* EMACS_FTFONT_H */ |