Merge from emacs-23

[gnu-emacs] / src / ftfont.h

diff --git a/src/ftfont.h b/src/ftfont.h
index f4b9aa0d6122a8b9ce8b0c1c9f4b436d281942af..38538decf0bec0f9969674435aacec339a4fa55d 100644 (file)
--- a/src/ftfont.h
+++ b/src/ftfont.h
@@ -36,6 +36,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 */
 
 /* arch-tag: cec13d1c-7156-4997-9ebd-e989040c3d78