Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

[lilypond.git] / lily / include / freetype.hh

diff --git a/lily/include/freetype.hh b/lily/include/freetype.hh
index 2e549e741ee2966386b87e65277b47a3a12c04ef..310e5893cdfd9c1e9c7c756b0018f9097da4895f 100644 (file)
--- a/lily/include/freetype.hh
+++ b/lily/include/freetype.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FREETYPE_HH
@@ -12,13 +12,11 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include "string.hh"
+#include "std-string.hh"
 
 void init_freetype ();
 extern FT_Library freetype2_library;
 
-
-FT_Face open_ft_face (String str);
+string freetype_error_string (int code);
 
 #endif /* FREETYPE_HH */
-