* ftfont.c (ftfont_shape_by_flt): Make static.

* ftfont.h (ftfont_shape_by_flt): Don't declare.

diff --git a/src/ChangeLog b/src/ChangeLog
index 871a2d362102c58b34966c88b9ff17043bf2c0e8..2118e4959d9ea0f493e7ebf215931a1a34acf109 100644 (file)
--- 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 b81a066a164d17eae725ca46d8707849bcabfdf0..da2760a78919b308d101596388b6c5e22d405d63 100644 (file)
--- 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 6a1ca92f4d84239ac8638c84c7553a29c14238ae..02156cba326d1d42bb3731176e05d850521d613e 100644 (file)
--- 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 */