[EMAIL PROTECTED] wrote:
Author: larsbj
Date: Mon Aug 14 00:54:59 2006
New Revision: 14661
URL: http://www.lyx.org/trac/changeset/14661
Log:
Merge the unicode branch into trunk.
Congratulation Lars.
I need the attached patch to compile with MSVC. I am comitting now if
you don't mind.
Could you give us a short status report of what's missing (except for
bug fixing of course)?
Abdel.
Index: support/unicode.C
===================================================================
--- support/unicode.C (revision 14662)
+++ support/unicode.C (working copy)
@@ -16,6 +16,10 @@
#include "debug.h"
+#include <boost/cstdint.hpp>
+
+#include <iconv.h>
+
#include <cerrno>
#include <iomanip>
#include <string>
@@ -45,7 +49,7 @@
}
}
- char * inbuf = const_cast<char *>(&buf[0]);
+ char const * inbuf = const_cast<char *>(&buf[0]);
size_t inbytesleft = buf.size();
char out[1000] = { 0 };
char * outbuf = out;
@@ -108,7 +112,7 @@
{
//lyxerr << "Outbuf =" << std::hex;
- std::vector<uint32_t> ucs4;
+ std::vector<boost::uint32_t> ucs4;
for (size_t i = 0; i < bytes.size(); i += 4) {
unsigned char const b1 = bytes[i ];
unsigned char const b2 = bytes[i + 1];
