- #ifdef MAKECRCH
- # include <stdio.h>
-@@ -1065,7 +1066,12 @@ unsigned long ZEXPORT crc32(crc, buf, len)
- const unsigned char FAR *buf;
- uInt len;
- {
-+/* if sizeof(unsigned long) > 4 */
-+#if ULONG_MAX > 0xffffffffUL
-+ return crc32_z(crc & 0xffffffffUL, buf, len);
-+#else
- return crc32_z(crc, buf, len);
-+#endif
+ /* Pre-condition the CRC */
+- crc ^= 0xffffffff;
++ crc = (~crc) & 0xffffffff;
+
+ /* Compute the CRC up to a word boundary. */
+ while (len && ((z_size_t)buf & 7) != 0) {
+@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+
+ /* Pre-condition the CRC */
+- crc ^= 0xffffffff;
++ crc = (~crc) & 0xffffffff;
+
+ #ifdef W
+
+@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+ #ifdef DYNAMIC_CRC_TABLE
+ once(&made, make_crc_table);
+ #endif /* DYNAMIC_CRC_TABLE */
+- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
++ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);