Georg Baum <[EMAIL PROTECTED]> writes:

| AC_CHECK_SIZEOF does this for us.
| 
| Shall I put this in?

Yes· (minor thingie below)

| Index: src/support/types.h
| ===================================================================
| --- src/support/types.h       (Revision 14987)
| +++ src/support/types.h       (Arbeitskopie)
| @@ -18,19 +18,20 @@
|  
|  #include "docstring.h"
|  
| -#include <boost/cstdint.hpp>

this us used below, you cannot delete it.

| -
|  #include <cstddef>
| -#include <string>
|  
|  namespace lyx {
|  
| -     // The type used to hold characters in paragraphs
| -     typedef boost::uint32_t char_type; // Possibly the ucs-4 type we will 
use
| -     //typedef wchar_t char_type;  // The wide char type CJK-LyX uses
| -     //typedef char char_type;       // Current narrow char type in use
| -
| -     //typedef std::wstring docstring;
| +     /// 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;
                  ^^^^
                 here
 
-- 
        Lgb

Reply via email to