X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ffreetype.hh;h=48805096363f5c123897f856924563406d069420;hb=0387f04497978e37b335a8b99eec905499d6ad0f;hp=2e549e741ee2966386b87e65277b47a3a12c04ef;hpb=153b9dc71fee4222b6d9d58d99c75c008b66ce5b;p=lilypond.git

diff --git a/lily/include/freetype.hh b/lily/include/freetype.hh
index 2e549e741e..4880509636 100644
--- 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FREETYPE_HH
@@ -12,13 +12,14 @@
 #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);
 
-FT_Face open_ft_face (String str);
+string freetype_error_string (int code);
 
 #endif /* FREETYPE_HH */