From bd61a7a387cf8fceef62e8c1379de1b281d4f2f1 Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Mon, 14 Aug 2006 14:19:52 +0000
Subject: [PATCH] Windows compilation fixes.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14671 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/support/unicode.C | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/support/unicode.C b/src/support/unicode.C
index d32c204b20..386e1e1b48 100644
--- a/src/support/unicode.C
+++ b/src/support/unicode.C
@@ -16,6 +16,10 @@
 
 #include "debug.h"
 
+#include <boost/cstdint.hpp>
+
+#include <iconv.h>
+
 #include <cerrno>
 #include <iomanip>
 #include <string>
@@ -45,7 +49,7 @@ iconv_convert(std::string const & tocode, std::string const & fromcode,
 		}
 	}
 
-	char * inbuf = const_cast<char *>(&buf[0]);
+	char ICONV_CONST * inbuf = const_cast<char ICONV_CONST *>(&buf[0]);
 	size_t inbytesleft = buf.size();
 	char out[1000] = { 0 };
 	char * outbuf = out;
@@ -108,7 +112,7 @@ std::vector<boost::uint32_t> bytes_to_ucs4(std::vector<char> const & bytes)
 {
 	//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];
-- 
2.39.2