diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-13 09:40:51 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-13 09:40:51 +0400 |
commit | 28ecc1ce20a1cedc15026c0f2ff54446c4e9bf73 (patch) | |
tree | 5a1d229fd161467e386a69ee1ec32d5404c9e7ed /source/blender/blenlib | |
parent | 8576a275dcb2652d4593e473ea61e2033d27c553 (diff) |
fix for building with mingw
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/intern/fileops.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/string_cursor_utf8.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index a8e233d214b..26e1ea13076 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -253,7 +253,7 @@ void *BLI_gzopen(const char *filename, const char *mode) /* 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); diff --git a/source/blender/blenlib/intern/string_cursor_utf8.c b/source/blender/blenlib/intern/string_cursor_utf8.c index a0d3be91607..0a579fa7108 100644 --- a/source/blender/blenlib/intern/string_cursor_utf8.c +++ b/source/blender/blenlib/intern/string_cursor_utf8.c @@ -118,8 +118,8 @@ int BLI_str_cursor_step_next_utf8(const char *str, size_t maxlen, int *pos) 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; } |