Closed jayaddison closed 6 months ago
Thanks.
The ioapi.h
and zip.h
files also need to be copied into include/xlsxwriter/third_party
. After that you may need to change some //
style comments to /**/
to fix some warnings. There may be other minor warnings as well. You may see some of the required changes in the diff against the existing code.
Thanks @jmcnamara - whereabouts do those warnings appear? (to make sure I'm resolving them correctly after the file copy)
whereabouts do those warnings appear? (to make sure I'm resolving them correctly after the file copy)
@jayaddison I can't reproduce the warning anymore. Copy the files without changes and if the CI is okay I will merge it.
Merged. Thanks.
You're welcome - thanks @jmcnamara.
Updates the vendored copy of
minizip
withinlibxlsxwriter
to the version distributed with version 1.3.1 of zlib.The diff here should match with the relevant changes between v1.3 and v1.3.1 of
zlib
( https://github.com/madler/zlib/compare/v1.3...v1.3.1 ), with the exception of 1dfd55bf17434fb5b4530597343129acbda71806 that is a cherry-pick already applied locally (#427) from madler/zlib@73331a6a0481067628f065ffe87bb1d8f787d10c (an upstream fix).Test results:
make test
make test_valgrind
(this is a follow-up to issue #419; I'd been awaiting an updated version of
zlib
and don't plan to track any further releases against that issue number)