From: Andreas Schwab <schwab@suse.de>
Date: Sun, 12 Oct 2008 12:50:00 +0000 (+0000)
Subject: * ftfont.c (ftfont_shape_by_flt): Make static.
X-Git-Tag: emacs-pretest-23.0.90~2528
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=990a73f04944decbcaf330c60ae3557b5a84ceca;p=emacs.git

* 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 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 */