diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-12 14:15:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-01-12 14:15:59 (GMT) |
| commit | 05dffe6e840e6e2c839fba8678888f00329760ae (patch) | |
| tree | 8bd429c16e1f1c73714feab2f4a1ef061ed7a303 | |
| parent | 33cf87619b7208e1eeef70fa3e5d0388e77bd00a (diff) | |
| parent | 7d92e363a2b828813810a960e1dea338bd660104 (diff) | |
| download | CMake-05dffe6e840e6e2c839fba8678888f00329760ae.zip CMake-05dffe6e840e6e2c839fba8678888f00329760ae.tar.gz CMake-05dffe6e840e6e2c839fba8678888f00329760ae.tar.bz2 | |
Merge branch 'fix-cmzlib-crc32-fn-mangling' into release-3.24
Merge-request: !8049
| -rw-r--r-- | Utilities/cmzlib/cm_zlib_mangle.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Utilities/cmzlib/cm_zlib_mangle.h b/Utilities/cmzlib/cm_zlib_mangle.h index 1461e2f..d75405d 100644 --- a/Utilities/cmzlib/cm_zlib_mangle.h +++ b/Utilities/cmzlib/cm_zlib_mangle.h @@ -19,7 +19,7 @@ # define compress2 cm_zlib_compress2 # define compressBound cm_zlib_compressBound #endif -#define crc32 z_crc32 +#define crc32 cm_zlib_crc32 #define crc32_combine cm_zlib_crc32_combine #define crc32_combine64 cm_zlib_crc32_combine64 #define crc32_z cm_zlib_crc32_z @@ -126,7 +126,6 @@ #define crc32_combine_gen cm_zlib_crc32_combine_gen #define crc32_combine_op cm_zlib_crc32_combine_op #define gz_error cm_zlib_gz_error -#define z_crc32 cm_zlib_z_crc32 #define z_errmsg cm_zlib_z_errmsg #endif |