From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 12 Mar 2001 15:49:14 +0000 (+0000)
Subject: small compilation fixes
X-Git-Tag: 1.6.10~21475
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6ee60cb738833064f09f2fa003afaca9f680a584;p=features.git

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 bb6990cc29..6456bb4392 100644
--- 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 ef6287914f..2da36b28b8 100644
--- 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 ebd358a739..b7bab8d2a1 100644
--- 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