Fixes: debbugs:17865

[bpt/emacs.git] / src / ftfont.h

diff --git a/src/ftfont.h b/src/ftfont.h
index 6a1ca92..8c8674f 100644 (file)
--- a/src/ftfont.h
+++ b/src/ftfont.h
@@ -1,5 +1,5 @@
 /* ftfont.h -- Interface definition for Freetype font backend.
 /* ftfont.h -- Interface definition for Freetype font backend.

-   Copyright (C) 2007, 2008
+   Copyright (C) 2007, 2008, 2009, 2010, 2011

      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 


@@ -33,12 +33,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <otf.h>
 #ifdef HAVE_M17N_FLT
 #include <m17n-flt.h>
 #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_M17N_FLT */

+#endif /* HAVE_LIBOTF */
+
+extern Lisp_Object ftfont_font_format (FcPattern *, Lisp_Object);
+extern FcCharSet *ftfont_get_fc_charset (Lisp_Object);

 
 #endif /* EMACS_FTFONT_H */
 
 
 #endif /* EMACS_FTFONT_H */
 

-/* arch-tag: cec13d1c-7156-4997-9ebd-e989040c3d78
-   (do not change this comment) */