X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Ftypes.h;h=446aa3d60f94ee09173ee90093354d00f983f914;hb=c8429d4bbc2e9291a6b5742233aecb089a3eece1;hp=cd46fcf62cb719d9f4a382a8987869c9d819f6de;hpb=0d43ba149a41e8860dde316ccbd4336d6b0bbdfa;p=lyx.git

diff --git a/src/support/types.h b/src/support/types.h
index cd46fcf62c..446aa3d60f 100644
--- a/src/support/types.h
+++ b/src/support/types.h
@@ -16,10 +16,23 @@
 #ifndef LYX_TYPES_H
 #define LYX_TYPES_H
 
+#include <boost/cstdint.hpp>
+
 #include <cstddef>
 
 namespace lyx {
 
+	/// The type used to hold characters in paragraphs
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
+	// Prefer this if possible because GNU libstdc++ has usable
+	// std::ctype<wchar_t> locale facets but not
+	// std::ctype<boost::uint32_t>. gcc older than 3.4 is also missing
+	// usable std::char_traits<boost::uint32_t>.
+	typedef wchar_t char_type;
+#else
+	typedef boost::uint32_t char_type;
+#endif
+
 	/// a type for positions used in paragraphs
 	// needs to be signed for a while to hold the special value -1 that is
 	// used there
@@ -28,7 +41,7 @@ namespace lyx {
 	/// a type for paragraph offsets
 	// FIXME: should be unsigned as well.
 	// however, simply changing it breaks a downward loop somewhere...
-	typedef ptrdiff_t  par_type;
+	typedef ptrdiff_t  pit_type;
 
 	/// a type for the nesting depth of a paragraph
 	typedef size_t     depth_type;