X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Finternational.hh;h=1e8b3fad219d0383aaacff44ccf42f0e18bf1bd8;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=095e47b43e1ac030df0e44cae0e86d90a19a72af;hpb=6c0a242bac0f7b3538adce970b5543cc415b46c4;p=lilypond.git

diff --git a/flower/include/international.hh b/flower/include/international.hh
index 095e47b43e..1e8b3fad21 100644
--- a/flower/include/international.hh
+++ b/flower/include/international.hh
@@ -3,13 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef INTERNATIONAL_HH
 #define INTERNATIONAL_HH
 
-#include "string.hh"
+#include <stdarg.h>
+
+#include "std-string.hh"
 
 /**
    Internationalisation: _i ("to be translated") gets an entry in the POT file
@@ -22,14 +24,19 @@
 /**
    Internationalisation: _ ("to be translated") gets "translated" by GNU gettext
 */
-String _ (char const *ch);
+string _ (char const *ch);
 
 /**
    Internationalisation: _f ("Usage: %s [FILE]", "lilypond") gets "translated" by
    GNU gettext
 */
-String _f (char const *format, ...);
-String _f (char const *format, String s, String s2 = "", String s3 = "");
+string _f (char const *format, ...)
+  	   __attribute__ ((format (printf, 1, 2)));
+string _f (char const *format, string s, string s2 = "", string s3 = "");
+/**
+   va_list version of _f
+ */
+string v_f (char const *format, va_list args);
 
 #endif // INTERNATIONAL_HH