Commit Graph

10 Commits

Author SHA1 Message Date
Brad King 8584f6dd15 Merge branch 'upstream-zlib' into update-zlib
* upstream-zlib:
  zlib 2024-01-22 (51b7f2ab)
2024-03-11 09:57:46 -04:00
Brad King 941b948a85 Merge branch 'upstream-zlib' into update-zlib
* upstream-zlib:
  zlib 2022-10-12 (04f42cec)

Fixes: #25576
2024-01-10 10:29:17 -05:00
Brad King 29c578c8fb zlib: Mangle symbols to avoid conflict with external transitive dependencies
Mangling was dropped by commit fc22ac115e (zlib: Drop old sources to
make room for a fresh import, 2022-05-26).  Restore it for the new
import of upstream zlib.
2022-06-11 05:10:27 -04:00
Brad King 152b4f8920 Merge branch 'upstream-zlib' into update-zlib
* upstream-zlib:
  zlib 2022-03-27 (21767c65)
2022-05-28 06:44:43 -04:00
Brad King 512c1f8f75 zlib: Fix typo in comment
Restore the fix from commit bf019d765d (Fix spelling and typos
(non-binary), 2012-11-07, v2.8.12~414^2~7).
2022-05-26 12:29:40 -04:00
Brad King 2be780ba5b Merge branch 'upstream-zlib' into update-zlib
# By zlib upstream
* upstream-zlib:
  zlib 2011-09-09 (abf180a0)
2022-05-26 12:29:03 -04:00
Brad King fc22ac115e zlib: Drop old sources to make room for a fresh import 2022-05-26 12:28:21 -04:00
Andreas Mohr bf019d765d Fix spelling and typos (non-binary) 2013-05-07 08:39:19 -04:00
David Cole 3edcd70754 ENH: Update zlib to 1.2.3. Addresses bugs #5445 and #3473. 2007-09-11 11:22:29 -04:00
Andy Cedilnik 0e4571d25c ENH: Initial import from VTK 2005-01-26 15:55:12 -05:00