small compilation fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1746 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index bb6990cc29345676e79d0fd0ae4e178ca77af8a1..6456bb4392e5841851174c9e65ee07bbd481d894 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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:

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index ef6287914f07ad1f070076e17a1d3ecf0f9f6184..2da36b28b8c67fe849a2c4a6cf560f1accfac72a 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -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)

diff --git a/src/gettext.h b/src/gettext.h
index ebd358a739535c0e7af6b69a36b54a242f80db9d..b7bab8d2a150bc933cff26af8869fd5fbc5a1181 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -51,7 +51,7 @@ void gettext_init(string const & localedir);
 ///
 #  define locale_init()
 ///
-#  define gettext_init(package, localedir)
+#  define gettext_init(localedir)
 
 #endif