aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2008-10-12 12:50:00 +0000
committerAndreas Schwab2008-10-12 12:50:00 +0000
commit990a73f04944decbcaf330c60ae3557b5a84ceca (patch)
treed0c2e71dab3e7337e481800033fbe2af482bf1f0
parentf6d52a3393b96613cadfd0010a1ce2123678526c (diff)
downloademacs-990a73f04944decbcaf330c60ae3557b5a84ceca.tar.gz
emacs-990a73f04944decbcaf330c60ae3557b5a84ceca.zip
* ftfont.c (ftfont_shape_by_flt): Make static.
* ftfont.h (ftfont_shape_by_flt): Don't declare.
-rw-r--r--src/ChangeLog3
-rw-r--r--src/ftfont.c2
-rw-r--r--src/ftfont.h4
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 @@
12008-10-12 Andreas Schwab <schwab@suse.de> 12008-10-12 Andreas Schwab <schwab@suse.de>
2 2
3 * ftfont.c (ftfont_shape_by_flt): Make static.
4 * ftfont.h (ftfont_shape_by_flt): Don't declare.
5
3 * font.c: Don't include <m17n-flt.h>. 6 * font.c: Don't include <m17n-flt.h>.
4 7
52008-10-10 Eli Zaretskii <eliz@gnu.org> 82008-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;
1803 1803
1804extern Lisp_Object QCfamily; 1804extern Lisp_Object QCfamily;
1805 1805
1806Lisp_Object 1806static Lisp_Object
1807ftfont_shape_by_flt (lgstring, font, ft_face, otf) 1807ftfont_shape_by_flt (lgstring, font, ft_face, otf)
1808 Lisp_Object lgstring; 1808 Lisp_Object lgstring;
1809 struct font *font; 1809 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/>. */
33#include <otf.h> 33#include <otf.h>
34#ifdef HAVE_M17N_FLT 34#ifdef HAVE_M17N_FLT
35#include <m17n-flt.h> 35#include <m17n-flt.h>
36extern Lisp_Object ftfont_shape_by_flt P_ ((Lisp_Object, struct font *,
37 FT_Face, OTF *));
38#endif /* HAVE_LIBOTF */
39#endif /* HAVE_M17N_FLT */ 36#endif /* HAVE_M17N_FLT */
37#endif /* HAVE_LIBOTF */
40 38
41#endif /* EMACS_FTFONT_H */ 39#endif /* EMACS_FTFONT_H */
42 40