* lily/melisma-engraver.cc (try_music): use melismaBusyProperties.

[lilypond.git] / flower / international.cc

diff --git a/flower/international.cc b/flower/international.cc
index 9f8003961ad27ce31c57ebed76448d994505fb62..7a5ce5ad37d6eaea7df178a7ec47a080d6586b5c 100644 (file)
--- a/flower/international.cc
+++ b/flower/international.cc
@@ -3,12 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
 #include <stdarg.h>
-#include "config.hh"
+#include "config.h"
 #include "string-convert.hh"
 #include "international.hh"
 
@@ -16,7 +16,7 @@
 inline char*
 gettext (char const* s)
 {
-  return s;
+  return (char*)s;
 }
 #else
 #include <libintl.h>
@@ -33,7 +33,7 @@ _f (char const* format, ...)
 {
   va_list args;
   va_start (args, format);
-  String str = String_convert::vform_str (gettext (format), args);
+  String str = String_convert::vform_string (gettext (format), args);
   va_end (args);
   return str;
 }
@@ -41,6 +41,6 @@ _f (char const* format, ...)
 String 
 _f (char const* format, String s, String s2, String s3)
 {
-  return String_convert::form_str (gettext (format), s.ch_C (), s2.ch_C (), 
-    s3.ch_C ());
+  return String_convert::form_string (gettext (format), s.to_str0 (), s2.to_str0 (), 
+    s3.to_str0 ());
 }