X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/43a8b8ca5797923a7a9848a513ecc8cfff655e17..7d72bb827da6e6a1a4df8752ace4513349adc28d:/src/ftfont.h

diff --git a/src/ftfont.h b/src/ftfont.h
index bd6d478018..58cceff63f 100644
--- a/src/ftfont.h
+++ b/src/ftfont.h
@@ -1,14 +1,14 @@
 /* ftfont.h -- Interface definition for Freetype font backend.
-   Copyright (C) 2007
+   Copyright (C) 2007, 2008, 2009
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+
 
 #ifndef EMACS_FTFONT_H
 #define EMACS_FTFONT_H
@@ -26,15 +25,16 @@ Boston, MA 02110-1301, USA.  */
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_SIZES_H
+#ifdef FT_BDF_H
+#include FT_BDF_H
+#endif
 
 #ifdef HAVE_LIBOTF
 #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 */