Remove legacy 16-bit workarounds

zlib-ng · Oct 9, 2014 · 279e637 · 279e637
1 parent dab4c0e
commit 279e637
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 22 deletions.
diff --git a/compress.c b/compress.c
@@ -31,10 +31,6 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
 
     stream.next_in = (z_const Bytef *)source;
     stream.avail_in = (uInt)sourceLen;
-#ifdef MAXSEG_64K
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-#endif
     stream.next_out = dest;
     stream.avail_out = (uInt)*destLen;
     if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;

diff --git a/uncompr.c b/uncompr.c
@@ -32,9 +32,6 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen)
 
     stream.next_in = (z_const Bytef *)source;
     stream.avail_in = (uInt)sourceLen;
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-
     stream.next_out = dest;
     stream.avail_out = (uInt)*destLen;
     if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;

diff --git a/zconf.h b/zconf.h
@@ -203,11 +203,7 @@
 
 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
+#  define MAX_MEM_LEVEL 9
 #endif
 
 /* Maximum value for windowBits in deflateInit2 and inflateInit2.

diff --git a/zconf.h.cmakein b/zconf.h.cmakein
@@ -205,11 +205,7 @@
 
 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
+#  define MAX_MEM_LEVEL 9
 #endif
 
 /* Maximum value for windowBits in deflateInit2 and inflateInit2.

diff --git a/zconf.h.in b/zconf.h.in
@@ -203,11 +203,7 @@
 
 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
+#  define MAX_MEM_LEVEL 9
 #endif
 
 /* Maximum value for windowBits in deflateInit2 and inflateInit2.