From 1206faeb99ab6c09baeb39ce0ed89539621ccebe Mon Sep 17 00:00:00 2001
From: Antony Riakiotakis <kalast@gmail.com>
Date: Sat, 22 Mar 2014 14:41:38 +0200
Subject: Warning cleanup:

* Comparison in utf detection code always failed
* Cast to integer to silence grumpy 64bit gcc
---
 intern/utfconv/utfconv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'intern/utfconv/utfconv.c')

diff --git a/intern/utfconv/utfconv.c b/intern/utfconv/utfconv.c
index 7f7a612528d..e5f8756917f 100644
--- a/intern/utfconv/utfconv.c
+++ b/intern/utfconv/utfconv.c
@@ -170,7 +170,7 @@ int conv_utf_8_to_16(const char *in8, wchar_t *out16, size_t size16)
 {
 	char u;
 	char type = 0;
-	wchar_t u32 = 0;
+	unsigned int u32 = 0;
 	wchar_t *out16end = out16 + size16;
 	int err = 0;
 	if (!size16 || !in8 || !out16) return UTF_ERROR_NULL_IN;
-- 
cgit v1.2.3