Merge remote-tracking branch 'upstream/master'

* upstream/master: Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning Conflicts: SSZipArchive/minizip/ioapi.c
2014-11-05 20:51:56 +00:00
parent e1bfb6e8ed 9f93d0c1b7
commit 553c4be486
1 changed files with 1 additions and 4 deletions
@@ -192,11 +192,8 @@ static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T
    }
    ret = 0;

-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wconversion"
-    if(fseeko64((FILE *)stream, offset, fseek_origin) != 0)
+    if(fseeko64((FILE *)stream, (long)offset, fseek_origin) != 0)
                        ret = -1;
-#pragma clang diagnostic pop
    return ret;
 }