X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdocstring.h;h=8c9a1f56d016bf930128a0c9bf5a6eb3045505bb;hb=848c89564fce9c4bfec79b915746dc6bc47abc3d;hp=0f097063076ee971fe4a6abc5f9b0161084bd91d;hpb=fe5c73915e90105a18497ab273ba7d39ac131ff6;p=lyx.git

diff --git a/src/support/docstring.h b/src/support/docstring.h
index 0f09706307..8c9a1f56d0 100644
--- a/src/support/docstring.h
+++ b/src/support/docstring.h
@@ -56,6 +56,15 @@ public:
  */
 std::string const to_local8bit(docstring const & s);
 
+/// convert \p s from the encoding of the file system to ucs4.
+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 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 *);
 
@@ -89,9 +98,9 @@ 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 {$
+namespace std {
 
 template<typename T> void
 char_traits<T>::assign(char_type & c1, char_type const & c2)