remove lyxrc dependence from support/*

[lyx.git] / src / support / docstring.h

diff --git a/src/support/docstring.h b/src/support/docstring.h
index 6ee612bb3cbf6913b8bd8aabec51733626b16e3b..8c9a1f56d016bf930128a0c9bf5a6eb3045505bb 100644 (file)
--- a/src/support/docstring.h
+++ b/src/support/docstring.h
@@ -62,8 +62,8 @@ docstring const from_filesystem8bit(std::string const & s);
 /// convert \p s from ucs4 to the encoding of the file system.
 std::string const to_filesystem8bit(docstring const & s);
 
-/// normalize \p s to precomposed form kc
-docstring const normalize_kc(docstring const & s);
+/// normalize \p s to precomposed form c
+docstring const normalize_c(docstring const & s);
 
 /// Compare a docstring with a C string of ASCII characters
 bool operator==(lyx::docstring const &, char const *);
@@ -98,7 +98,7 @@ lyx::docstring & operator+=(lyx::docstring & l, char r);
 } // namespace lyx
 
 
-#if SIZEOF_WCHAR_T != 4 && defined(__GNUC__) && defined(__GNUC_MINOR__) && __GNUC__ == 3 && __GNUC_MINOR__ < 4
+#if ! defined(USE_WCHAR_T) && defined(__GNUC__) && defined(__GNUC_MINOR__) && __GNUC__ == 3 && __GNUC_MINOR__ < 4
 // Missing char_traits methods in gcc 3.3 and older. Taken from gcc 4.2svn.
 namespace std {