[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56746] trunk/blender/source/blender/ blenlib/intern: fix for building with mingw

[Campbell Barton]

Revision: 56746
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56746
Author:   campbellbarton
Date:     2013-05-13 05:40:51 +0000 (Mon, 13 May 2013)
Log Message:
-----------
fix for building with mingw

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/fileops.c
    trunk/blender/source/blender/blenlib/intern/string_cursor_utf8.c

Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fileops.c	2013-05-13 05:37:45 UTC (rev 56745)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c	2013-05-13 05:40:51 UTC (rev 56746)
@@ -253,7 +253,7 @@
 
 		/* temporary #if until we update all libraries to 1.2.7
 		 * for  correct wide char path handling */
-#if ZLIB_VERNUM >= 0x1270
+#if ZLIB_VERNUM >= 0x1270 && !defined(FREE_WINDOWS)
 		UTF16_ENCODE(filename);
 
 		gzfile = gzopen_w(filename_16, mode);

Modified: trunk/blender/source/blender/blenlib/intern/string_cursor_utf8.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string_cursor_utf8.c	2013-05-13 05:37:45 UTC (rev 56745)
+++ trunk/blender/source/blender/blenlib/intern/string_cursor_utf8.c	2013-05-13 05:40:51 UTC (rev 56746)
@@ -118,8 +118,8 @@
 	const char *str_next = BLI_str_find_next_char_utf8(str_pos, str_end);
 	if (str_next) {
 		(*pos) += (str_next - str_pos);
-		if ((*pos) > maxlen) {
-			(*pos) = maxlen;
+		if ((*pos) > (int)maxlen) {
+			(*pos) = (int)maxlen;
 		}
 		return TRUE;
 	}