diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
| commit | d8f0ea999983892b8e5e49340ece3474ee257156 (patch) | |
| tree | ce9b615075350d90d0b7312874bae6dd202fe93b /ports/assimp/uninitialized-variable.patch | |
| parent | 22e9a2b25db21e1d1a1f75786442f2c90ae0db0c (diff) | |
| parent | 6e05f9cdf5cf4d53153214f4d4b29133b368bc4d (diff) | |
| download | vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.tar.gz vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.zip | |
resolve merge conflicts
Diffstat (limited to 'ports/assimp/uninitialized-variable.patch')
| -rw-r--r-- | ports/assimp/uninitialized-variable.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ports/assimp/uninitialized-variable.patch b/ports/assimp/uninitialized-variable.patch new file mode 100644 index 000000000..f7b51c143 --- /dev/null +++ b/ports/assimp/uninitialized-variable.patch @@ -0,0 +1,13 @@ +diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h +index 916fb1f..a7bc178 100644 +--- a/contrib/zip/src/miniz.h ++++ b/contrib/zip/src/miniz.h +@@ -4420,7 +4420,7 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name + #ifndef MINIZ_NO_STDIO + mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags) + { +- mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes; ++ mz_uint uncomp_crc32 = MZ_CRC32_INIT, level = 0, num_alignment_padding_bytes; + mz_uint16 method = 0, dos_time = 0, dos_date = 0, ext_attributes = 0; + mz_uint64 local_dir_header_ofs, cur_archive_file_ofs, uncomp_size = 0, comp_size = 0; + size_t archive_name_size; |