X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdocstring.cpp;h=95c86b3665f2877052e543556e25d382fcaffcba;hb=aef8746712ccc64f1f10073fe6d011ff1d7eb4a4;hp=727e1f594c4e9fab34b8f0b79d7b66d4bdb8e125;hpb=d7e2705228d0580a16046a3f3c19f453a035b99d;p=lyx.git

diff --git a/src/support/docstring.cpp b/src/support/docstring.cpp
index 727e1f594c..95c86b3665 100644
--- a/src/support/docstring.cpp
+++ b/src/support/docstring.cpp
@@ -69,14 +69,6 @@ string const to_ascii(docstring const & ucs4)
 }
 
 
-IconvProcessor & utf8ToUcs4()
-{
-	static IconvProcessor iconv(ucs4_codeset, "UTF-8");
-	return iconv;
-}
-
-
-
 void utf8_to_ucs4(string const & utf8, docstring & ucs4)
 {
 	size_t n = utf8.size();
@@ -522,7 +514,7 @@ protected:
 		return do_put_helper(oit, b, fill, v);
 	}
 
-#ifdef _GLIBCXX_USE_LONG_LONG
+#ifdef LYX_USE_LONG_LONG
 	iter_type
 	do_put(iter_type oit, ios_base & b, char_type fill, long long v) const
 	{
@@ -683,7 +675,7 @@ protected:
 		return do_get_integer(iit, eit, b, err, v);
 	}
 
-#ifdef _GLIBCXX_USE_LONG_LONG
+#ifdef LYX_USE_LONG_LONG
 	iter_type
 	do_get(iter_type iit, iter_type eit, ios_base & b,
 		ios_base::iostate & err, long long & v) const