small compilation fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1746 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-03-12 15:49:14 +00:00
parent b36f0c6aad
commit 6ee60cb738
3 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,11 @@
2001-03-12 John Levon <moz@compsoc.man.ac.uk>
* gettext.h: fix gettext_init() in --disable-nls
2001-03-12 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* LaTeXFeatures.C (getMacros): add a .c_str() when using sstream.
2001-03-09 John Levon <moz@compsoc.man.ac.uk>
* lyx.C:

View File

@ -367,7 +367,7 @@ string const LaTeXFeatures::getMacros()
// effect. (Lgb)
}
}
macros += floats.str();
macros += floats.str().c_str();
for (LanguageList::const_iterator cit = UsedLanguages.begin();
cit != UsedLanguages.end(); ++cit)

View File

@ -51,7 +51,7 @@ void gettext_init(string const & localedir);
///
# define locale_init()
///
# define gettext_init(package, localedir)
# define gettext_init(localedir)
#endif