Expose zlib constants for backwards compat

zlib-ng / minizip-ng

Fork of the popular zip manipulation library found in the zlib distribution.

Other

1.25k stars 434 forks source link

Expose zlib constants for backwards compat #815

Closed Coeur closed 2 weeks ago

Coeur commented 3 weeks ago

Fix #747 Supersedes #750 (cc @brad0)

I re-did the PR to account for the recent refactor in 7df56f7cc8438b1b67c881cad049b29bf075bccd

brad0 commented 3 weeks ago

Thanks for taking this on.

brad0 commented 3 weeks ago

Also I noticed anything even remotely modern for zlib uses ZLIB_H instead of _ZLIB_H for the header guard, which is kinda strange as such guards usually have a prefix underscore.

https://github.com/madler/zlib/commit/8e34b3a8024c028dd9fd21d70525fc6d215efde5

Coeur commented 3 weeks ago

Oh my, good catch.

the legacy zlib uses ZLIB_H since zlib 1.2.0.2. It was using _ZLIB_H before that. (https://github.com/madler/zlib/commit/8e34b3a8024c028dd9fd21d70525fc6d215efde5)
zlib-ng uses ZLIB_H_ since zlib-ng 1.9.9-b1. It was using ZLIB_H before that. (https://github.com/zlib-ng/zlib-ng/commit/d1de3909245b9152993cf8dced0c4d69fe04efd4)

I've now taken care of this in a2c1b2a5d196bc4da7c675fe58c2cb41bb243316

brad0 commented 3 weeks ago

Also regarding header guards..

unzip.h / zip.h _ZLIBIOAPI_H

ioapi.h ZLIBIOAPI64_H

Coeur commented 3 weeks ago

Also regarding header guards..

Those aren't a big deal. And if we want to change it, it's not in the scope of this PR.

nmoinvaz commented 2 weeks ago

Since compat files moved to compat dir, not sure how to get cmake to use those when installing.