zlib 1.0-pre

zlib 0.99
zlib 0.95
2011-09-09 23:13:27 -07:00 · 2011-09-09 23:11:37 -07:00 · 2011-09-09 23:10:21 -07:00 · 2011-09-09 23:09:18 -07:00
34 changed files with 1550 additions and 724 deletions
--- a/60
+++ b/60
@@ -1,5 +1,65 @@
+
 		ChangeLog file for zlib

+Changes in 1.0 (15 Jan 96)
+- fixed deflate for 64-bit systems (detected on Cray)
+- fixed inflate_blocks for 64-bit systems (detected on Alpha)
+- make falloc completely reentrant (inftrees.c)
+- fixed very unlikely race condition in ct_static_init
+- always return Z_BUF_ERROR when deflate() has nothing to do
+- add deflateParams in zlib.h.
+- test large buffers and deflateParams in example.c
+- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
+- Document Z_SYNC_FLUSH
+- added deflateGetAdler32 and deflateSetAdler32
+- free in reverse order of allocation to help memory manager
+- Check for __cpluplus in zlib.h
+- Finer test in ct_align for partial flush
+- avoid harmless warnings for Borland C++
+- initialize hash_head in deflate.c
+- avoid warning on fdopen (gzio.c) for HP cc -Aa
+- include stdlib.h for STDC compilers
+- include errno.h for Cray
+- ignore error if ranlib doesn't exist
+- call ranlib twice for NeXTSTEP
+- use exec_prefix instead of prefix for libz.a
+- renamed ct_* as tr_* to avoid conflict with another application.
+- clear z->msg in inflateInit2 before any error return
+- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
+- fixed typo in zconf.h (_GNUC__ => __GNUC__)
+- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
+- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
+- in fcalloc, normalize pointer if size > 65520 bytes
+- don't use special fcalloc for 32 bit Borland C++
+- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
+
+Changes in 0.95 (16 Aug 95)
+- fix MSDOS small and medium model (now easier to adapt to any compiler)
+- inlined send_bits
+- fix the final (:-) bug for deflate with flush (output was correct but
+  not completely flushed in rare occasions).
+- default window size is same for compression and decompression
+  (it's now sufficient to set MAX_WBITS in zconf.h).
+- voidp -> voidpf and voidnp -> voidp (for consistency with other
+  typedefs and because voidnp was not near in large model).
+
+Changes in 0.94 (13 Aug 95)
+- support MSDOS medium model
+- fix deflate with flush (could sometimes generate bad output)
+- fix deflateReset (zlib header was incorrectly suppressed)
+- added support for VMS
+- allow a compression level in gzopen()
+- gzflush now calls fflush
+- For deflate with flush, flush even if no more input is provided.
+- rename libgz.a as libz.a
+- avoid complex expression in infcodes.c triggering Turbo C bug
+- work around a problem with gcc on Alpha (in INSERT_STRING)
+- don't use inline functions (problem with some gcc versions)
+- allow renaming of Byte, uInt, etc... with #define.
+- avoid warning about (unused) pointer before start of array in deflate.c
+- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
+- avoid reserved word 'new' in trees.c
+
 Changes in 0.93 (25 June 95)
 - temporarily disable inline functions
 - make deflate deterministic
--- a/Make_vms.com
+++ b/Make_vms.com
@@ -0,0 +1,115 @@
+$! make libz under VMS
+$! written by Martin P.J. Zinser <m.zinser@gsi.de>
+$!
+$! Look for the compiler used
+$!
+$ ccopt = ""
+$ if f$getsyi("HW_MODEL").ge.1024
+$ then
+$  ccopt = "/prefix=all"+ccopt
+$  comp  = "__decc__=1"
+$  if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$ else
+$  if f$search("SYS$SYSTEM:DECC$COMPILER.EXE").eqs.""
+$   then
+$    comp  = "__vaxc__=1"
+$    if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$   else
+$    if f$trnlnm("SYS").eqs."" then define sys decc$library_include:
+$    ccopt = "/decc/prefix=all"+ccopt
+$    comp  = "__decc__=1"
+$  endif
+$ endif
+$!
+$! Build the thing plain or with mms
+$!
+$ write sys$output "Compiling Zlib sources ..."
+$ if f$search("SYS$SYSTEM:MMS.EXE").eqs.""
+$  then
+$   dele example.obj;*,minigzip.obj;*
+$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
+                adler32.c zutil.h zlib.h zconf.h
+$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
+                compress.c zlib.h zconf.h
+$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
+                crc32.c zutil.h zlib.h zconf.h
+$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
+                deflatec.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" -
+                gsio.c zutil.h zlib.h zconf.h
+$   CALL MAKE infblock.OBJ "CC ''CCOPT' infblock" -
+                infblock.c zutil.h zlib.h zconf.h infblock.h
+$   CALL MAKE infcodes.OBJ "CC ''CCOPT' infcodes" -
+                infcodes.c zutil.h zlib.h zconf.h inftrees.h
+$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
+                inffast.c zutil.h zlib.h zconf.h inffast.h
+$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
+                inflate.c zutil.h zlib.h zconf.h infblock.h
+$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
+                inftrees.c zutil.h zlib.h zconf.h inftrees.h
+$   CALL MAKE infutil.OBJ "CC ''CCOPT' infutil" -
+                infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
+$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
+                trees.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
+                uncompr.c zlib.h zconf.h
+$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
+                zutil.c zutil.h zlib.h zconf.h
+$   write sys$output "Building Zlib ..."
+$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
+$   write sys$output "Building example..."
+$   CALL MAKE example.OBJ "CC ''CCOPT' example" -
+                example.c zlib.h zconf.h
+$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
+$   write sys$output "Building minigzip..."
+$   CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -
+                minigzip.c zlib.h zconf.h
+$   call make minigzip.exe - 
+                "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" - 
+                minigzip.obj libz.olb
+$  else
+$   mms/macro=('comp')
+$  endif
+$ write sys$output "Zlib build completed"
+$ exit
+$!
+$!
+$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
+$ V = 'F$Verify(0)
+$! P1 = What we are trying to make
+$! P2 = Command to make it
+$! P3 - P8  What it depends on
+$
+$ If F$Search(P1) .Eqs. "" Then Goto Makeit
+$ Time = F$CvTime(F$File(P1,"RDT"))
+$arg=3
+$Loop:
+$       Argument = P'arg
+$       If Argument .Eqs. "" Then Goto Exit
+$       El=0
+$Loop2:
+$       File = F$Element(El," ",Argument)
+$       If File .Eqs. " " Then Goto Endl
+$       AFile = ""
+$Loop3:
+$       OFile = AFile
+$       AFile = F$Search(File)
+$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
+$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
+$       Goto Loop3
+$NextEL:
+$       El = El + 1
+$       Goto Loop2
+$EndL:
+$ arg=arg+1
+$ If arg .Le. 8 Then Goto Loop
+$ Goto Exit
+$
+$Makeit:
+$ VV=F$VERIFY(0)
+$ write sys$output P2
+$ 'P2
+$ VV='F$Verify(VV)
+$Exit:
+$ If V Then Set Verify
+$ENDSUBROUTINE
--- a/35
+++ b/35
@@ -1,17 +1,18 @@
 # Makefile for zlib
-# Copyright (C) 1995 Jean-loup Gailly.
+# Copyright (C) 1995-1996 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in zlib.h 

 CC=cc
 CFLAGS=-O
-#use -O3 for gcc to take advantage of inlining
+#use -O3 for gcc
 #CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
 #CFLAGS=-g -DDEBUG
-LDFLAGS=-L. -lgz
+LDFLAGS=-L. -lz

 RANLIB=ranlib

 prefix=/usr/local
+exec_prefix = ${prefix}

 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
@@ -24,33 +25,39 @@ test: all
 	./example
 	echo hello world | ./minigzip | ./minigzip -d 

-install: libgz.a
+install: libz.a
 	-@mkdir $(prefix)/include
-	-@mkdir $(prefix)/lib
+	-@mkdir $(exec_prefix)/lib
 	cp zlib.h zconf.h $(prefix)/include
 	chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
-	cp libgz.a $(prefix)/lib
-	chmod 644 $(prefix)/lib/libgz.a
+	cp libz.a $(exec_prefix)/lib
+	chmod 644 $(exec_prefix)/lib/libz.a
+	-@$(RANLIB) $(prefix)/lib/libz.a
+# This second ranlib is needed on NeXTSTEP which checks file times

-libgz.a: $(OBJS)
+libz.a: $(OBJS)
 	ar rc $@ $(OBJS)
-	$(RANLIB) $@
+	-@$(RANLIB) $@

-example: example.o libgz.a
+example: example.o libz.a
 	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)

-minigzip: minigzip.o libgz.a
+minigzip: minigzip.o libz.a
 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)

 clean:
-	rm -f *.o example minigzip libgz.a foo.gz
+	rm -f *.o example minigzip libz.a foo.gz

 zip:
-	zip -ul9 zlib README ChangeLog Makefile Makefile.??? Makefile.?? *.[ch]
+	zip -ul9 zlib README ChangeLog Makefile Make????.??? Makefile.?? \
+	  descrip.mms *.[ch]

 tgz:
 	cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
-		zlib/Makefile.??? zlib/Makefile.?? zlib/*.[ch]
+	  zlib/Make????.??? zlib/Makefile.?? zlib/descrip.mms zlib/*.[ch]
+
+TAGS:
+	etags *.[ch]

 # DO NOT DELETE THIS LINE -- make depend depends on it.

--- a/Makefile.bor
+++ b/Makefile.bor
@@ -2,11 +2,14 @@
 # Borland C++   ************ UNTESTED ***********

 # To use, do "make -fmakefile.bor"
+# To compile in small model, set below: MODEL=-ms

 # WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
-# requirements (default 256K for big objects plus a few K), you can add
-# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# MAX_WBITS and MAX_MEM_LEVEL. For example:
+#    -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to CFLAGS below: 
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.

 # ------------- Turbo C++, Borland C++ -------------
@@ -83,6 +86,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h

 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2)
+	del zlib.lib
 	$(LIB) zlib +$(OBJP1)
 	$(LIB) zlib +$(OBJP2)

--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2,11 +2,11 @@
 # Microsoft C 5.1 or later

 # To use, do "make makefile.msc"
+# To compile in small model, set below: MODEL=-AS

-# WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
-# requirements (default 256K for big objects plus a few K), you can add
-# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to CFLAGS below: 
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.

 # ------------- Microsoft C 5.1 and later -------------
@@ -80,6 +80,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h

 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2)
+        del zlib.lib
 	lib zlib $(OBJ1);
 	lib zlib $(OBJ2);

--- a/Makefile.qnx
+++ b/Makefile.qnx
@@ -0,0 +1,75 @@
+# Makefile for zlib
+# Copyright (C) 1995 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h 
+
+# Modified slightly for QNX by Chris Herborth (chrish@qnx.com)
+
+CC=cc
+CFLAGS=-4 -O -Q
+#use -O3 for gcc to take advantage of inlining
+#CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+#CFLAGS=-g -DDEBUG
+LDFLAGS=-L. -lz
+
+#RANLIB=ranlib
+
+prefix=/usr/local
+
+OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: example minigzip
+
+test: all
+	./example
+	echo hello world | ./minigzip | ./minigzip -d 
+
+install: zlib.lib
+	-@mkdir $(prefix)/include
+	-@mkdir $(prefix)/lib
+	cp zlib.h zconf.h $(prefix)/include
+	chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
+	cp zlib.lib $(prefix)/lib
+	chmod 644 $(prefix)/lib/zlib.lib
+
+zlib.lib: $(OBJS)
+	cc -A $@ $(OBJS)
+#	ar rc $@ $(OBJS)
+#	$(RANLIB) $@
+
+example: example.o zlib.lib
+	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+
+minigzip: minigzip.o zlib.lib
+	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+
+clean:
+	rm -f *.o example minigzip zlib.lib foo.gz
+
+zip:
+	zip -ul9 zlib README ChangeLog Makefile Makefile.??? Makefile.?? *.[ch]
+
+tgz:
+	cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
+		zlib/Makefile.??? zlib/Makefile.?? zlib/*.[ch]
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o: zutil.h zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: zutil.h zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+example.o: zlib.h zconf.h
+gzio.o: zutil.h zlib.h zconf.h
+infblock.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+infcodes.o: zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h infblock.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+infutil.o: zutil.h zlib.h zconf.h inftrees.h infutil.h
+minigzip.o: zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h
--- a/Makefile.tc
+++ b/Makefile.tc
@@ -2,20 +2,24 @@
 # TurboC 2.0

 # To use, do "make -fmakefile.tc"
+# To compile in small model, set below: MODEL=-ms

 # WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
-# requirements (default 256K for big objects plus a few K), you can add
-# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# MAX_WBITS and MAX_MEM_LEVEL. For example:
+#    -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to CFLAGS below: 
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.

 # ------------- Turbo C 2.0 -------------
 MODEL=-ml
-CFLAGS=-O2 -Z $(MODEL)
-CC=tcc
-LD=tcc
+# CFLAGS=-O2 -G -Z $(MODEL) -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+CFLAGS=-O2 -G -Z $(MODEL)
+CC=tcc -I\tc\include
+LD=tcc -L\tc\lib
 LIB=tlib
-LDFLAGS=$(MODEL)
+LDFLAGS=$(MODEL) -f-
 O=.obj

 # variables
@@ -82,6 +86,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h

 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2)
+	del zlib.lib
 	$(LIB) zlib +$(OBJP1)
 	$(LIB) zlib +$(OBJP2)

--- a/69
+++ b/69
@@ -1,40 +1,59 @@
-zlib 0.93 is a beta version of a general purpose compression library.
+zlib 1.0 is a general purpose data compression library.
+All the code is reentrant (thread safe).

 The data format used by the zlib library is described in the
-files zlib-3.1.doc, deflate-1.1.doc and gzip-4.1.doc, available
-in ftp.uu.net:/pub/archiving/zip/doc.
+files zlib-3.2.doc, deflate-1.2.doc and gzip-4.2.doc, available
+in ftp://ftp.uu.net/pub/archiving/zip/doc

 All functions of the compression library are documented in the file
 zlib.h. A usage example of the library is given in the file example.c
-which also tests that the library is working correctly.
+which also tests that the library is working correctly. Another
+example is given in the file minigzip.c.

 To compile all files and run the test program, just type: make test
-(For MSDOS, use one of the special makefiles such as Makefile.msc.)
-To install the zlib library (libgz.a) in /usr/local/lib, type: make install
-To install in a different directory, use for example: make install prefix=$HOME
+(For MSDOS, use one of the special makefiles such as Makefile.msc;
+for VMS, use Make_vms.com or descrip.mms.)
+To install the zlib library (libz.a) in /usr/local/lib, type: make install
+To install in a different directory, use for example:
+  make install prefix=$HOME
 This will install in $HOME/lib instead of /usr/local/lib.

-The changes made in version 0.93 are documented in the file ChangeLog.
-The main changes since 0.9 are:
- temporarily disable inline functions
- make deflate deterministic
- don't use signed char in inflate (not portable enough)
- fix inflate memory leak for segmented architectures
- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
- Document the memory requirements in zconf.h
- added "make install"
- added support for DJGPP and Pyramid
- fix an inflate bug for stored blocks.
- various speedups
+Questions about zlib should be sent to <zlib@quest.jpl.nasa.gov>.

-On MSDOS, this version works in both large and small model. However
-small model compression works only for small values of MAX_MEM_LEVEL
-and MAX_WBITS (see zconf.h). Small model decompression should work up
-to MAX_WBITS=15.  This version of zlib does not support small or
-medium model with far allocation of big objects.
+The changes made in version 1.0 are documented in the file ChangeLog.
+The main changes since 0.95 are:
+- allow compression level 0 (no compression)
+- add deflateParams in zlib.h: allow dynamic change of compression level
+  and compression strategy.
+- test large buffers and deflateParams in example.c
+- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
+- fixes for 64-bit systems (needed for Alpha and Cray)
+- always return Z_BUF_ERROR when deflate() has nothing to do
+- fix some very unlikely race conditions.
+- several minor fixes for better portability
+- free in reverse order of allocation to help memory manager
+
+Notes for some targets:
+
+- For MSDOS, the small and medium models have been tested only with
+  Microsoft C.  (This should work for Borland C also, but I don't have
+  a Borland compiler to test with.) The small model was tested with
+  Turbo C but only with reduced performance to avoid any far
+  allocation; it was tested with -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+
+  MS Visual C++1.5 in far model gives:
+     warning C4746: 'z_errmsg' : unsized array treated as '__far'
+     warning C4746: 'inflate_mask' : unsized array treated as  '__far'
+  Ignore those warnings.
+
+- For 64-bit Iris, deflate.c must be compiled without any optimization.
+  With -O, one libpng test fails. The test works in 32 bit mode (with the
+  -32 compiler flag).


-  Copyright (C) 1995 Jean-loup Gailly and Mark Adler
+Copyright notice:
+
+ (C) 1995-1996 Jean-loup Gailly and Mark Adler

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/adler32.c
+++ b/adler32.c
@@ -5,9 +5,9 @@

 /* $Id: adler32.c,v 1.6 1995/05/03 17:27:08 jloup Exp $ */

-#include "zutil.h"
+#include "zlib.h"

-#define BASE 65521 /* largest prime smaller than 65536 */
+#define BASE 65521L /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */

@@ -20,7 +20,7 @@
 /* ========================================================================= */
 uLong adler32(adler, buf, len)
    uLong adler;
-    Byte *buf;
+    Bytef *buf;
    uInt len;
 {
    unsigned long s1 = adler & 0xffff;
--- a/compress.c
+++ b/compress.c
@@ -20,9 +20,9 @@
   buffer.
 */
 int compress (dest, destLen, source, sourceLen)
-    Byte *dest;
-    uLong *destLen;
-    Byte *source;
+    Bytef *dest;
+    uLongf *destLen;
+    Bytef *source;
    uLong sourceLen;
 {
    z_stream stream;
@@ -39,6 +39,7 @@ int compress (dest, destLen, source, sourceLen)

    stream.zalloc = (alloc_func)0;
    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;

    err = deflateInit(&stream, Z_DEFAULT_COMPRESSION);
    if (err != Z_OK) return err;
--- a/crc32.c
+++ b/crc32.c
@@ -3,7 +3,7 @@
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */

-/* $Id: crc32.c,v 1.5 1995/05/01 13:55:46 jloup Exp $ */
+/* $Id: crc32.c,v 1.4 1995/04/14 14:55:12 jloup Exp $ */

 #include "zlib.h"

@@ -99,7 +99,7 @@ local uLong crc_table[] = {
 /* ========================================================================= */
 uLong crc32(crc, buf, len)
    uLong crc;
-    Byte *buf;
+    Bytef *buf;
    uInt len;
 {
    if (buf == Z_NULL) return 0L;
--- a/deflate.c
+++ b/deflate.c
@@ -51,7 +51,7 @@

 #include "deflate.h"

-char copyright[] = " deflate Copyright 1995 Jean-loup Gailly ";
+char deflate_copyright[] = " deflate 1.0 Copyright 1995 Jean-loup Gailly ";
 /*
  If you use the zlib library in a product, an acknowledgment is welcome
  in the documentation of your product. If for some reason you cannot
@@ -59,6 +59,32 @@ char copyright[] = " deflate Copyright 1995 Jean-loup Gailly ";
  copyright string in the executable of your product.
 */

+/* ===========================================================================
+ *  Prototypes for local functions.
+ */
+
+local void fill_window    OF((deflate_state *s));
+local int  deflate_stored OF((deflate_state *s, int flush));
+local int  deflate_fast   OF((deflate_state *s, int flush));
+local int  deflate_slow   OF((deflate_state *s, int flush));
+local void lm_init        OF((deflate_state *s));
+local int longest_match   OF((deflate_state *s, IPos cur_match));
+local void putShortMSB    OF((deflate_state *s, uInt b));
+local void flush_pending  OF((z_stream *strm));
+local int read_buf        OF((z_stream *strm, charf *buf, unsigned size));
+#ifdef ASMV
+      void match_init OF((void)); /* asm code initialization */
+#endif
+
+#ifdef DEBUG
+local  void check_match OF((deflate_state *s, IPos start, IPos match,
+                            int length));
+#endif
+
+/* ===========================================================================
+ * Local data
+ */
+
 #define NIL 0
 /* Tail of hash chains */

@@ -72,32 +98,35 @@ char copyright[] = " deflate Copyright 1995 Jean-loup Gailly ";
 * See deflate.c for comments about the MIN_MATCH+1.
 */

+typedef int (*compress_func) OF((deflate_state *s, int flush));
+/* Compressing function */
+
 /* Values for max_lazy_match, good_match and max_chain_length, depending on
 * the desired pack level (0..9). The values given below have been tuned to
 * exclude worst case performance for pathological files. Better values may be
 * found for specific files.
 */
-
 typedef struct config_s {
   ush good_length; /* reduce lazy search above this match length */
   ush max_lazy;    /* do not perform lazy search above this match length */
   ush nice_length; /* quit search above this match length */
   ush max_chain;
+   compress_func func;
 } config;

 local config configuration_table[10] = {
 /*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0},  /* store only */
-/* 1 */ {4,    4,  8,    4},  /* maximum speed, no lazy matches */
-/* 2 */ {4,    5, 16,    8},
-/* 3 */ {4,    6, 32,   32},
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* maximum speed, no lazy matches */
+/* 2 */ {4,    5, 16,    8, deflate_fast},
+/* 3 */ {4,    6, 32,   32, deflate_fast},

-/* 4 */ {4,    4, 16,   16},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32},
-/* 6 */ {8,   16, 128, 128},
-/* 7 */ {8,   32, 128, 256},
-/* 8 */ {32, 128, 258, 1024},
-/* 9 */ {32, 258, 258, 4096}}; /* maximum compression */
+/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
+/* 5 */ {8,   16, 32,   32, deflate_slow},
+/* 6 */ {8,   16, 128, 128, deflate_slow},
+/* 7 */ {8,   32, 128, 256, deflate_slow},
+/* 8 */ {32, 128, 258, 1024, deflate_slow},
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* maximum compression */

 /* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
 * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
@@ -109,28 +138,6 @@ local config configuration_table[10] = {

 struct static_tree_desc_s {int dummy;}; /* for buggy compilers */

-/* ===========================================================================
- *  Prototypes for local functions.
- */
-
-local void fill_window   __P((deflate_state *s));
-local int  deflate_fast  __P((deflate_state *s, int flush));
-local int  deflate_slow  __P((deflate_state *s, int flush));
-local void lm_init       __P((deflate_state *s));
-local inline int longest_match __P((deflate_state *s, IPos cur_match));
-local void putShortMSB   __P((deflate_state *s, uInt b));
-local void flush_pending __P((z_stream *strm));
-local int read_buf       __P((z_stream *strm, char *buf, unsigned size));
-#ifdef ASMV
-      void match_init __P((void)); /* asm code initialization */
-#endif
-
-#ifdef DEBUG
-local  void check_match __P((deflate_state *s, IPos start, IPos match,
-                             int length));
-#endif
-
-
 /* ===========================================================================
 * Update a hash value with the given input byte
 * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
@@ -139,6 +146,7 @@ local  void check_match __P((deflate_state *s, IPos start, IPos match,
 */
 #define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)

+
 /* ===========================================================================
 * Insert string str in the dictionary and set match_head to the previous head
 * of the hash chain (the most recent string with same hash key). Return
@@ -148,7 +156,7 @@ local  void check_match __P((deflate_state *s, IPos start, IPos match,
 *    (except for the last MIN_MATCH-1 bytes of the input file).
 */
 #define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + MIN_MATCH-1]), \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
    s->prev[(str) & s->w_mask] = match_head = s->head[s->ins_h], \
    s->head[s->ins_h] = (str))

@@ -158,14 +166,14 @@ local  void check_match __P((deflate_state *s, IPos start, IPos match,
 */
 #define CLEAR_HASH(s) \
    s->head[s->hash_size-1] = NIL; \
-    zmemzero((char*)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+    zmemzero((charf *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));

 /* ========================================================================= */
 int deflateInit (strm, level)
    z_stream *strm;
    int level;
 {
-    return deflateInit2 (strm, level, DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, 0);
+    return deflateInit2 (strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, 0);
    /* To do: ignore strm->next_in if we use it as window */
 }

@@ -184,7 +192,10 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
    if (strm == Z_NULL) return Z_STREAM_ERROR;

    strm->msg = Z_NULL;
-    if (strm->zalloc == Z_NULL) strm->zalloc = zcalloc;
+    if (strm->zalloc == Z_NULL) {
+	strm->zalloc = zcalloc;
+	strm->opaque = (voidpf)0;
+    }
    if (strm->zfree == Z_NULL) strm->zfree = zcfree;

    if (level == Z_DEFAULT_COMPRESSION) level = 6;
@@ -193,13 +204,14 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
        noheader = 1;
        windowBits = -windowBits;
    }
-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != DEFLATED ||
-        windowBits < 8 || windowBits > 15 || level < 1 || level > 9) {
+    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
+        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
+	strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
        return Z_STREAM_ERROR;
    }
    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
    if (s == Z_NULL) return Z_MEM_ERROR;
-    strm->state = (struct internal_state *)s;
+    strm->state = (struct internal_state FAR *)s;
    s->strm = strm;

    s->noheader = noheader;
@@ -212,13 +224,13 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
    s->hash_mask = s->hash_size - 1;
    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);

-    s->window = (Byte*) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-    s->prev   = (Pos*)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    s->head   = (Pos*)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));

    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */

-    s->pending_buf = (uch*) ZALLOC(strm, s->lit_bufsize, 2*sizeof(ush));
+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 2*sizeof(ush));

    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
        s->pending_buf == Z_NULL) {
@@ -226,11 +238,11 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
        deflateEnd (strm);
        return Z_MEM_ERROR;
    }
-    s->d_buf = (ush*) &(s->pending_buf[s->lit_bufsize]);
-    s->l_buf = (uch*) &(s->pending_buf[3*s->lit_bufsize]);
+    s->l_buf = (uchf *) &(s->pending_buf[s->lit_bufsize]);
+    s->d_buf = (ushf *) &(s->pending_buf[2*s->lit_bufsize]);
    /* We overlay pending_buf and d_buf+l_buf. This works since the average
     * output size for (length,distance) codes is <= 32 bits (worst case
-     * is 15+15+13=33).
+     * is 15+15+13=33). d_buf is put last in case sizeof(short)>2.
     */

    s->level = level;
@@ -240,6 +252,35 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
    return deflateReset(strm);
 }

+/* =========================================================================
+ * Undocumented function to return the Adler32 of a stream. It can be
+ * called immediately after a flush with Z_SYNC_FLUSH, to allow later
+ * resumption of the compressor with deflateSetAdler32.
+ */
+uLong deflateGetAdler32 (strm)
+    z_stream *strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return (uLong)Z_STREAM_ERROR;
+    /* Z_STREAM_ERROR happens to be an invalid Adler32 value. */
+
+    return strm->state->adler;
+}
+
+/* =========================================================================
+ * Undocumented function to set the Adler32 of a stream. It can be called
+ * immediately after deflateInit to reset the Adler32 of a compression
+ * stream which had been interrupted.
+ */
+int deflateSetAdler32 (strm, adler)
+    z_stream *strm;
+    uLong adler;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+
+    strm->state->adler = adler;
+    return Z_OK;
+}
+
 /* ========================================================================= */
 int deflateReset (strm)
    z_stream *strm;
@@ -257,19 +298,60 @@ int deflateReset (strm)
    s->pending = 0;
    s->pending_out = s->pending_buf;

+    if (s->noheader < 0) {
+        s->noheader = 0; /* was set to -1 by deflate(..., Z_FINISH); */
+    }
    s->status = s->noheader ? BUSY_STATE : INIT_STATE;
    s->adler = 1;
+    s->last_flush = Z_NO_FLUSH;

-    ct_init(s);
+    tr_init(s);
    lm_init(s);

    return Z_OK;
 }

+/* ========================================================================= */
+int deflateParams(strm, level, strategy)
+    z_stream *strm;
+    int level;
+    int strategy;
+{
+    deflate_state *s;
+    compress_func func;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+
+    if (level == Z_DEFAULT_COMPRESSION) {
+	level = 6;
+    }
+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
+	return Z_STREAM_ERROR;
+    }
+    func = configuration_table[s->level].func;
+
+    if (func != configuration_table[level].func
+	&& strm->state->lookahead != 0) {
+
+	/* Flush the last buffer: */
+	(void)(*func)(strm->state, Z_PARTIAL_FLUSH);
+    }
+    if (s->level != level) {
+	s->level = level;
+	s->max_lazy_match   = configuration_table[level].max_lazy;
+	s->good_match       = configuration_table[level].good_length;
+	s->nice_match       = configuration_table[level].nice_length;
+	s->max_chain_length = configuration_table[level].max_chain;
+    }
+    s->strategy = strategy;
+    return Z_OK;
+}
+
 /* =========================================================================
- * Put a short the pending_out buffer. The 16-bit value is put in MSB order.
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
 * IN assertion: the stream state is correct and there is enough room in
- * the pending_out buffer.
+ * pending_buf.
 */
 local void putShortMSB (s, b)
    deflate_state *s;
@@ -280,7 +362,10 @@ local void putShortMSB (s, b)
 }   

 /* =========================================================================
- * Flush as much pending output as possible.
+ * Flush as much pending output as possible. All deflate() output goes
+ * through this function so some applications may wish to modify it
+ * to avoid allocating a large strm->next_out buffer and copying into it.
+ * (See also read_buf()).
 */
 local void flush_pending(strm)
    z_stream *strm;
@@ -306,19 +391,25 @@ int deflate (strm, flush)
    z_stream *strm;
    int flush;
 {
+    int old_flush; /* value of flush param for previous deflate call */
+
    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
    
-    if (strm->next_out == Z_NULL || strm->next_in == Z_NULL) {
+    if (strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
+	(strm->state->status == FINISH_STATE && flush != Z_FINISH)) {
        ERR_RETURN(strm, Z_STREAM_ERROR);
    }
    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);

    strm->state->strm = strm; /* just in case */
+    old_flush = strm->state->last_flush;
+    strm->state->last_flush = flush;

    /* Write the zlib header */
    if (strm->state->status == INIT_STATE) {

-        uInt header = (DEFLATED + ((strm->state->w_bits-8)<<4)) << 8;
+        uInt header = (Z_DEFLATED + ((strm->state->w_bits-8)<<4)) << 8;
        uInt level_flags = (strm->state->level-1) >> 1;

        if (level_flags > 3) level_flags = 3;
@@ -333,6 +424,14 @@ int deflate (strm, flush)
    if (strm->state->pending != 0) {
        flush_pending(strm);
        if (strm->avail_out == 0) return Z_OK;
+
+    /* Make sure there is something to do and avoid duplicate consecutive
+     * flushes. For repeated and useless calls with Z_FINISH, we keep
+     * returning Z_STREAM_END instead of Z_BUFF_ERROR.
+     */
+    } else if (strm->avail_in == 0 && flush <= old_flush &&
+	       flush != Z_FINISH) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
    }

    /* User must not provide more input after the first FINISH: */
@@ -342,29 +441,39 @@ int deflate (strm, flush)

    /* Start a new block or continue the current one.
     */
-    if (strm->avail_in != 0 ||
-        (flush == Z_FINISH && strm->state->status != FINISH_STATE)) {
+    if (strm->avail_in != 0 || strm->state->lookahead != 0 ||
+        (flush != Z_NO_FLUSH && strm->state->status != FINISH_STATE)) {
        int quit;

        if (flush == Z_FINISH) {
            strm->state->status = FINISH_STATE;
        }
-        if (strm->state->level <= 3) {
-            quit = deflate_fast(strm->state, flush);
-        } else {
-            quit = deflate_slow(strm->state, flush);
-        }
-        if (flush == Z_FULL_FLUSH || flush == Z_SYNC_FLUSH) {
-            ct_stored_block(strm->state, (char*)0, 0L, 0); /* special marker */
-            flush_pending(strm);
+	quit = (*(configuration_table[strm->state->level].func))
+	    (strm->state, flush);
+
+        if (quit || strm->avail_out == 0) return Z_OK;
+        /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+         * of deflate should use the same flush parameter to make sure
+         * that the flush is complete. So we don't have to output an
+         * empty block here, this will be done at next call. This also
+         * ensures that for a very small output buffer, we emit at most
+         * one empty block.
+         */
+        if (flush != Z_NO_FLUSH && flush != Z_FINISH) {
+            if (flush == Z_PARTIAL_FLUSH) {
+                tr_align(strm->state);
+            } else { /* FULL_FLUSH or SYNC_FLUSH */
+                tr_stored_block(strm->state, (char*)0, 0L, 0);
+                /* For a full flush, this empty block will be recognized
+                 * as a special marker by inflate_sync().
+                 */
                if (flush == Z_FULL_FLUSH) {
                    CLEAR_HASH(strm->state);             /* forget history */
                }
-        } else if (flush == Z_PARTIAL_FLUSH) {
-            ct_align(strm->state);
-            flush_pending(strm);
            }
-        if (quit || strm->avail_out == 0) return Z_OK;
+            flush_pending(strm);
+            if (strm->avail_out == 0) return Z_OK;
+        }
    }
    Assert(strm->avail_out > 0, "bug2");

@@ -378,7 +487,7 @@ int deflate (strm, flush)
    /* If avail_out is zero, the application will call deflate again
     * to flush the rest.
     */
-    strm->state->noheader = 1; /* write the trailer only once! */
+    strm->state->noheader = -1; /* write the trailer only once! */
    return strm->state->pending != 0 ? Z_OK : Z_STREAM_END;
 }

@@ -388,10 +497,11 @@ int deflateEnd (strm)
 {
    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    TRY_FREE(strm, strm->state->window);
-    TRY_FREE(strm, strm->state->prev);
-    TRY_FREE(strm, strm->state->head);
+    /* Deallocate in reverse order of allocations: */
    TRY_FREE(strm, strm->state->pending_buf);
+    TRY_FREE(strm, strm->state->head);
+    TRY_FREE(strm, strm->state->prev);
+    TRY_FREE(strm, strm->state->window);

    ZFREE(strm, strm->state);
    strm->state = Z_NULL;
@@ -410,7 +520,7 @@ int deflateCopy (dest, source)
    *dest = *source;
    return Z_STREAM_ERROR; /* to be implemented */
 #if 0
-    dest->state = (struct internal_state *)
+    dest->state = (struct internal_state FAR *)
        (*dest->zalloc)(1, sizeof(deflate_state));
    if (dest->state == Z_NULL) return Z_MEM_ERROR;

@@ -421,11 +531,14 @@ int deflateCopy (dest, source)

 /* ===========================================================================
 * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
 */
 local int read_buf(strm, buf, size)
    z_stream *strm;
-    char *buf;
+    charf *buf;
    unsigned size;
 {
    unsigned len = strm->avail_in;
@@ -465,7 +578,7 @@ local void lm_init (s)
    s->strstart = 0;
    s->block_start = 0L;
    s->lookahead = 0;
-    s->match_length = MIN_MATCH-1;
+    s->match_length = s->prev_length = MIN_MATCH-1;
    s->match_available = 0;
    s->ins_h = 0;
 #ifdef ASMV
@@ -485,13 +598,13 @@ local void lm_init (s)
 /* For 80x86 and 680x0, an optimized version will be provided in match.asm or
 * match.S. The code will be functionally equivalent.
 */
-local inline int longest_match(s, cur_match)
+local int longest_match(s, cur_match)
    deflate_state *s;
    IPos cur_match;                             /* current match */
 {
    unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Byte *scan = s->window + s->strstart; /* current string */
-    register Byte *match;                       /* matched string */
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
    register int len;                           /* length of current match */
    int best_len = s->prev_length;              /* best match length so far */
    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
@@ -499,18 +612,18 @@ local inline int longest_match(s, cur_match)
    /* Stop when cur_match becomes <= limit. To simplify the code,
     * we prevent matches with the string of window index 0.
     */
-    Pos *prev = s->prev;
+    Posf *prev = s->prev;
    uInt wmask = s->w_mask;

 #ifdef UNALIGNED_OK
    /* Compare two bytes at a time. Note: this is not always beneficial.
     * Try with and without -DUNALIGNED_OK to check.
     */
-    register Byte *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ush*)scan;
-    register ush scan_end   = *(ush*)(scan+best_len-1);
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+    register ush scan_start = *(ushf*)scan;
+    register ush scan_end   = *(ushf*)(scan+best_len-1);
 #else
-    register Byte *strend = s->window + s->strstart + MAX_MATCH;
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
    register Byte scan_end1  = scan[best_len-1];
    register Byte scan_end   = scan[best_len];
 #endif
@@ -524,7 +637,7 @@ local inline int longest_match(s, cur_match)
    if (s->prev_length >= s->good_match) {
        chain_length >>= 2;
    }
-    Assert(s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");

    do {
        Assert(cur_match < s->strstart, "no future");
@@ -537,8 +650,8 @@ local inline int longest_match(s, cur_match)
        /* This code assumes sizeof(unsigned short) == 2. Do not use
         * UNALIGNED_OK if your compiler uses a different size.
         */
-        if (*(ush*)(match+best_len-1) != scan_end ||
-            *(ush*)match != scan_start) continue;
+        if (*(ushf*)(match+best_len-1) != scan_end ||
+            *(ushf*)match != scan_start) continue;

        /* It is not necessary to compare scan[2] and match[2] since they are
         * always equal when the other bytes match, given that the hash keys
@@ -549,12 +662,13 @@ local inline int longest_match(s, cur_match)
         * necessary to put more guard bytes at the end of the window, or
         * to check more often for insufficient lookahead.
         */
+        Assert(scan[2] == match[2], "scan[2]?");
        scan++, match++;
        do {
-        } while (*(ush*)(scan+=2) == *(ush*)(match+=2) &&
-                 *(ush*)(scan+=2) == *(ush*)(match+=2) &&
-                 *(ush*)(scan+=2) == *(ush*)(match+=2) &&
-                 *(ush*)(scan+=2) == *(ush*)(match+=2) &&
+        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
                 scan < strend);
        /* The funny "do {}" generates better code on most compilers */

@@ -579,6 +693,7 @@ local inline int longest_match(s, cur_match)
         * the hash keys are equal and that HASH_BITS >= 8.
         */
        scan += 2, match++;
+        Assert(*scan == *match, "match[2]?");

        /* We check for insufficient lookahead only every 8th comparison;
         * the 256th check will be made at strstart+258.
@@ -602,7 +717,7 @@ local inline int longest_match(s, cur_match)
            best_len = len;
            if (len >= s->nice_match) break;
 #ifdef UNALIGNED_OK
-            scan_end = *(ush*)(scan+best_len-1);
+            scan_end = *(ushf*)(scan+best_len-1);
 #else
            scan_end1  = scan[best_len-1];
            scan_end   = scan[best_len];
@@ -625,11 +740,13 @@ local void check_match(s, start, match, length)
    int length;
 {
    /* check that the match is indeed a match */
-    if (memcmp((char*)s->window + match,
-                (char*)s->window + start, length) != EQUAL) {
+    if (memcmp((charf *)s->window + match,
+                (charf *)s->window + start, length) != EQUAL) {
        fprintf(stderr,
-            " start %d, match %d, length %d\n",
+            " start %u, match %u, length %d\n",
            start, match, length);
+        do { fprintf(stderr, "%c%c", s->window[match++],
+                     s->window[start++]); } while (--length != 0);
        z_error("invalid match");
    }
    if (verbose > 1) {
@@ -655,7 +772,7 @@ local void fill_window(s)
    deflate_state *s;
 {
    register unsigned n, m;
-    register Pos *p;
+    register Posf *p;
    unsigned more;    /* Amount of free space at the end of the window. */
    uInt wsize = s->w_size;

@@ -665,6 +782,7 @@ local void fill_window(s)
        /* Deal with !@#$% 64K limit: */
        if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
            more = wsize;
+
        } else if (more == (unsigned)(-1)) {
            /* Very unlikely, but possible on 16 bit machine if strstart == 0
             * and lookahead == 1 (input done one byte at time)
@@ -676,10 +794,7 @@ local void fill_window(s)
         */
        } else if (s->strstart >= wsize+MAX_DIST(s)) {

-            /* By the IN assertion, the window is not empty so we can't confuse
-             * more == 0 with more == 64K on a 16 bit machine.
-             */
-            zmemcpy((char*)s->window, (char*)s->window+wsize,
+            zmemcpy((charf *)s->window, (charf *)s->window+wsize,
                   (unsigned)wsize);
            s->match_start -= wsize;
            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
@@ -690,17 +805,17 @@ local void fill_window(s)
               at the expense of memory usage):
             */
            n = s->hash_size;
-            p = &s->head[n-1];
+            p = &s->head[n];
            do {
-                m = *p;
-                *p-- = (Pos)(m >= wsize ? m-wsize : NIL);
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
            } while (--n);

            n = wsize;
-            p = &s->prev[n-1];
+            p = &s->prev[n];
            do {
-                m = *p;
-                *p-- = (Pos)(m >= wsize ? m-wsize : NIL);
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
                /* If n is not on any hash chain, prev[n] is garbage but
                 * its value will never be used.
                 */
@@ -723,15 +838,17 @@ local void fill_window(s)
         */
        Assert(more >= 2, "more < 2");

-        n = read_buf(s->strm, (char*)s->window + s->strstart + s->lookahead,
+        n = read_buf(s->strm, (charf *)s->window + s->strstart + s->lookahead,
                     more);
        s->lookahead += n;

        /* Initialize the hash value now that we have some input: */
-        if (s->strstart == 0 && s->lookahead >= MIN_MATCH-1) {
-            for (n=0; n<MIN_MATCH-1; n++) {
-                UPDATE_HASH(s, s->ins_h, s->window[n]);
-            }
+        if (s->lookahead >= MIN_MATCH) {
+            s->ins_h = s->window[s->strstart];
+            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
        }
        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
         * but this is not important since only literal bytes will be emitted.
@@ -745,11 +862,12 @@ local void fill_window(s)
 * IN assertion: strstart is set to the end of the current match.
 */
 #define FLUSH_BLOCK_ONLY(s, eof) { \
-   ct_flush_block(s, (s->block_start >= 0L ? \
-               (char*)&s->window[(unsigned)s->block_start] : \
-               (char*)Z_NULL), (long)s->strstart - s->block_start, (eof)); \
+   tr_flush_block(s, (s->block_start >= 0L ? \
+               (charf *)&s->window[(unsigned)s->block_start] : \
+               (charf *)Z_NULL), (long)s->strstart - s->block_start, (eof)); \
   s->block_start = s->strstart; \
   flush_pending(s->strm); \
+   Tracev((stderr,"[FLUSH]")); \
 }

 /* Same but force premature exit if necessary. */
@@ -758,10 +876,55 @@ local void fill_window(s)
   if (s->strm->avail_out == 0) return 1; \
 }

+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * true if processing was terminated prematurely (no more input or output
+ * space).  This function does not insert new strings in the dictionary
+ * since uncompressible data is probably not useful. This function is used
+ * only for the level=0 compression option.
+ * NOTE: this function should be optimized to avoid extra copying.
+ */
+local int deflate_stored(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    for (;;) {
+        /* Fill the window as much as possible: */
+        if (s->lookahead <= 1) {
+
+            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
+		   s->block_start >= (long)s->w_size, "slide too late");
+
+            fill_window(s);
+            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return 1;
+
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+	Assert(s->block_start >= 0L, "block gone");
+
+	s->strstart += s->lookahead;
+	s->lookahead = 0;
+
+        /* Stored blocks are limited to 0xffff bytes: */
+        if (s->strstart == 0 || s->strstart > 0xffff) {
+	    /* strstart == 0 is possible when wraparound on 16-bit machine */
+	    s->lookahead = s->strstart - 0xffff;
+	    s->strstart = 0xffff;
+	}
+
+	/* Emit a stored block if it is large enough: */
+        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
+            FLUSH_BLOCK(s, 0);
+	}
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return 0; /* normal exit */
+}
+
 /* ===========================================================================
 * Compress as much as possible from the input stream, return true if
 * processing was terminated prematurely (no more input or output space).
- * This function does not perform lazy evaluationof matches and inserts
+ * This function does not perform lazy evaluation of matches and inserts
 * new strings in the dictionary only for unmatched strings or for short
 * matches. It is used only for the fast compression options.
 */
@@ -769,11 +932,9 @@ local int deflate_fast(s, flush)
    deflate_state *s;
    int flush;
 {
-    IPos hash_head; /* head of the hash chain */
+    IPos hash_head = NIL; /* head of the hash chain */
    int bflush;           /* set if current block must be flushed */

-    s->prev_length = MIN_MATCH-1;
-
    for (;;) {
        /* Make sure that we always have enough lookahead, except
         * at the end of the input file. We need MAX_MATCH bytes
@@ -790,7 +951,9 @@ local int deflate_fast(s, flush)
        /* Insert the string window[strstart .. strstart+2] in the
         * dictionary, and set hash_head to the head of the hash chain:
         */
+        if (s->lookahead >= MIN_MATCH) {
            INSERT_STRING(s, s->strstart, hash_head);
+        }

        /* Find the longest match, discarding those <= prev_length.
         * At this point we have always match_length < MIN_MATCH
@@ -810,7 +973,7 @@ local int deflate_fast(s, flush)
        if (s->match_length >= MIN_MATCH) {
            check_match(s, s->strstart, s->match_start, s->match_length);

-            bflush = ct_tally(s, s->strstart - s->match_start,
+            bflush = tr_tally(s, s->strstart - s->match_start,
                              s->match_length - MIN_MATCH);

            s->lookahead -= s->match_length;
@@ -818,15 +981,14 @@ local int deflate_fast(s, flush)
            /* Insert new strings in the hash table only if the match length
             * is not too large. This saves time but degrades compression.
             */
-            if (s->match_length <= s->max_insert_length) {
+            if (s->match_length <= s->max_insert_length &&
+                s->lookahead >= MIN_MATCH) {
                s->match_length--; /* string at strstart already in hash table */
                do {
                    s->strstart++;
                    INSERT_STRING(s, s->strstart, hash_head);
                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                     * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
-                     * these bytes are garbage, but it does not matter since
-                     * the next lookahead bytes will be emitted as literals.
+                     * always MIN_MATCH bytes ahead.
                     */
                } while (--s->match_length != 0);
                s->strstart++; 
@@ -838,11 +1000,14 @@ local int deflate_fast(s, flush)
 #if MIN_MATCH != 3
                Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                 * matter since it will be recomputed at next deflate call.
+                 */
            }
        } else {
            /* No match, output a literal byte */
            Tracevv((stderr,"%c", s->window[s->strstart]));
-            bflush = ct_tally (s, 0, s->window[s->strstart]);
+            bflush = tr_tally (s, 0, s->window[s->strstart]);
            s->lookahead--;
            s->strstart++; 
        }
@@ -861,7 +1026,7 @@ local int deflate_slow(s, flush)
    deflate_state *s;
    int flush;
 {
-    IPos hash_head;          /* head of hash chain */
+    IPos hash_head = NIL;    /* head of hash chain */
    int bflush;              /* set if current block must be flushed */

    /* Process the input block. */
@@ -881,7 +1046,9 @@ local int deflate_slow(s, flush)
        /* Insert the string window[strstart .. strstart+2] in the
         * dictionary, and set hash_head to the head of the hash chain:
         */
+        if (s->lookahead >= MIN_MATCH) {
            INSERT_STRING(s, s->strstart, hash_head);
+        }

        /* Find the longest match, discarding those <= prev_length.
         */
@@ -914,25 +1081,25 @@ local int deflate_slow(s, flush)
         * match is not better, output the previous match:
         */
        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+            /* Do not insert strings in hash table beyond this. */

            check_match(s, s->strstart-1, s->prev_match, s->prev_length);

-            bflush = ct_tally(s, s->strstart -1 - s->prev_match,
+            bflush = tr_tally(s, s->strstart -1 - s->prev_match,
                              s->prev_length - MIN_MATCH);

            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted.
+             * strstart-1 and strstart are already inserted. If there is not
+             * enough lookahead, the last two strings are not inserted in
+             * the hash table.
             */
            s->lookahead -= s->prev_length-1;
            s->prev_length -= 2;
            do {
-                s->strstart++;
+                if (++s->strstart <= max_insert) {
                    INSERT_STRING(s, s->strstart, hash_head);
-                /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                 * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
-                 * these bytes are garbage, but it does not matter since the
-                 * next lookahead bytes will always be emitted as literals.
-                 */
+                }
            } while (--s->prev_length != 0);
            s->match_available = 0;
            s->match_length = MIN_MATCH-1;
@@ -946,7 +1113,7 @@ local int deflate_slow(s, flush)
             * is longer, truncate the previous match to a single literal.
             */
            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            if (ct_tally (s, 0, s->window[s->strstart-1])) {
+            if (tr_tally (s, 0, s->window[s->strstart-1])) {
                FLUSH_BLOCK_ONLY(s, 0);
            }
            s->strstart++;
@@ -961,10 +1128,13 @@ local int deflate_slow(s, flush)
            s->lookahead--;
        }
    }
+    Assert (flush != Z_NO_FLUSH, "no flush?");
    if (s->match_available) {
-        ct_tally (s, 0, s->window[s->strstart-1]);
+        Tracevv((stderr,"%c", s->window[s->strstart-1]));
+        tr_tally (s, 0, s->window[s->strstart-1]);
        s->match_available = 0;
    }
    FLUSH_BLOCK(s, flush == Z_FINISH);
    return 0;
 }
+
--- a/deflate.h
+++ b/deflate.h
@@ -58,7 +58,7 @@ typedef struct ct_data_s {
        ush  dad;        /* father node in Huffman tree */
        ush  len;        /* length of bit string */
    } dl;
-} ct_data;
+} FAR ct_data;

 #define Freq fc.freq
 #define Code fc.code
@@ -71,10 +71,12 @@ typedef struct tree_desc_s {
    ct_data *dyn_tree;           /* the dynamic tree */
    int     max_code;            /* largest code with non zero frequency */
    static_tree_desc *stat_desc; /* the corresponding static tree */
-} tree_desc;
+} FAR tree_desc;

 typedef ush Pos;
+typedef Pos FAR Posf;
 typedef unsigned IPos;
+
 /* A Pos is an index in the character window. We use short instead of int to
 * save space in the various tables. IPos is used only for parameter passing.
 */
@@ -82,13 +84,14 @@ typedef unsigned IPos;
 typedef struct internal_state {
    z_stream *strm;      /* pointer back to this zlib stream */
    int   status;        /* as the name implies */
-    Byte *pending_buf;   /* output still pending */
-    Byte *pending_out;   /* next pending byte to output to the stream */
+    Bytef *pending_buf;  /* output still pending */
+    Bytef *pending_out;  /* next pending byte to output to the stream */
    int   pending;       /* nb of bytes in the pending buffer */
    uLong adler;         /* adler32 of uncompressed data */
    int   noheader;      /* suppress zlib header and adler32 */
    Byte  data_type;     /* UNKNOWN, BINARY or ASCII */
    Byte  method;        /* STORED (for zip only) or DEFLATED */
+    int   last_flush;    /* value of flush param for previous deflate call */

                /* used by deflate.c: */

@@ -96,7 +99,7 @@ typedef struct internal_state {
    uInt  w_bits;        /* log2(w_size)  (8..16) */
    uInt  w_mask;        /* w_size - 1 */

-    Byte *window;
+    Bytef *window;
    /* Sliding window. Input bytes are read into the second half of the window,
     * and move to the first half later to keep a dictionary of at least wSize
     * bytes. With this organization, matches are limited to a distance of
@@ -111,13 +114,13 @@ typedef struct internal_state {
     * is directly used as sliding window.
     */

-    Pos *prev;
+    Posf *prev;
    /* Link to older string with same hash index. To limit the size of this
     * array to 64K, this link is maintained only for the last 32K strings.
     * An index in this array is thus a window index modulo 32K.
     */

-    Pos *head; /* Heads of the hash chains or NIL. */
+    Posf *head; /* Heads of the hash chains or NIL. */

    uInt  ins_h;          /* hash index of string to be inserted */
    uInt  hash_size;      /* number of elements in hash table */
@@ -174,14 +177,14 @@ typedef struct internal_state {
    int nice_match; /* Stop searching when current match exceeds this */

                /* used by trees.c: */
+    /* Didn't use ct_data typedef below to supress compiler warning */
+    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */

-    ct_data dyn_ltree[HEAP_SIZE];   /* literal and length tree */
-    ct_data dyn_dtree[2*D_CODES+1]; /* distance tree */
-    ct_data bl_tree[2*BL_CODES+1];  /* Huffman tree for the bit lengths */
-
-    tree_desc l_desc;               /* descriptor for literal tree */
-    tree_desc d_desc;               /* descriptor for distance tree */
-    tree_desc bl_desc;              /* descriptor for bit length tree */
+    struct tree_desc_s l_desc;               /* desc. for literal tree */
+    struct tree_desc_s d_desc;               /* desc. for distance tree */
+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */

    ush bl_count[MAX_BITS+1];
    /* number of codes at each bit length for an optimal tree */
@@ -197,7 +200,7 @@ typedef struct internal_state {
    /* Depth of each subtree used as tie breaker for trees of equal frequency
     */

-    uch *l_buf;           /* buffer for literals or lengths */
+    uchf *l_buf;          /* buffer for literals or lengths */

    uInt  lit_bufsize;
    /* Size of match buffer for literals/lengths.  There are 4 reasons for
@@ -221,7 +224,7 @@ typedef struct internal_state {

    uInt last_lit;      /* running index in l_buf */

-    ush *d_buf;
+    ushf *d_buf;
    /* Buffer for distances. To simplify the code, d_buf and l_buf have
     * the same number of elements. To use different lengths, an extra flag
     * array would be necessary.
@@ -231,6 +234,7 @@ typedef struct internal_state {
    ulg static_len;     /* bit length of current block with static trees */
    ulg compressed_len; /* total bit length of compressed file */
    uInt matches;       /* number of string matches in current block */
+    int last_eob_len;   /* bit length of EOB code for last block */

 #ifdef DEBUG
    ulg bits_sent;      /* bit length of the compressed data */
@@ -245,8 +249,7 @@ typedef struct internal_state {
     * are always zero.
     */

-} deflate_state;
-
+} FAR deflate_state;

 /* Output a byte on the stream.
 * IN assertion: there is enough room in pending_buf.
@@ -265,9 +268,9 @@ typedef struct internal_state {
 */

        /* in trees.c */
-void ct_init       __P((deflate_state *s));
-int  ct_tally      __P((deflate_state *s, int dist, int lc));
-ulg ct_flush_block __P((deflate_state *s, char *buf, ulg stored_len, int eof));
-void ct_align      __P((deflate_state *s));
-void ct_stored_block __P((deflate_state *s, char *buf, ulg stored_len,
+void tr_init      OF((deflate_state *s));
+int  tr_tally      OF((deflate_state *s, int dist, int lc));
+ulg tr_flush_block OF((deflate_state *s, charf *buf, ulg stored_len, int eof));
+void tr_align      OF((deflate_state *s));
+void tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
                         int eof));
--- a/descrip.mms
+++ b/descrip.mms
@@ -0,0 +1,48 @@
+# descrip.mms: MMS description file for building zlib on VMS
+# written by Martin P.J. Zinser <m.zinser@gsi.de>
+
+cc_defs = 
+c_deb = 
+
+.ifdef __DECC__
+pref = /prefix=all
+.endif
+
+OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj,\
+       deflate.obj, trees.obj, zutil.obj, inflate.obj, infblock.obj,\
+       inftrees.obj, infcodes.obj, infutil.obj, inffast.obj
+
+CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF)
+
+all : example.exe minigzip.exe
+        @ write sys$output " Example applications available"
+libz.olb : libz.olb($(OBJS))
+	@ write sys$output " libz available"
+
+example.exe : example.obj libz.olb
+              link example,libz.olb/lib
+
+minigzip.exe : minigzip.obj libz.olb
+              link minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
+
+clean : 
+	delete *.obj;*,libz.olb;*
+
+
+# Other dependencies.
+adler32.obj : zutil.h zlib.h zconf.h
+compress.obj : zlib.h zconf.h
+crc32.obj : zutil.h zlib.h zconf.h
+deflate.obj : deflate.h zutil.h zlib.h zconf.h
+example.obj : zlib.h zconf.h
+gzio.obj : zutil.h zlib.h zconf.h
+infblock.obj : zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+infcodes.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
+inffast.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+inflate.obj : zutil.h zlib.h zconf.h infblock.h
+inftrees.obj : zutil.h zlib.h zconf.h inftrees.h
+infutil.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h
+minigzip.obj : zlib.h zconf.h
+trees.obj : deflate.h zutil.h zlib.h zconf.h
+uncompr.obj : zlib.h zconf.h
+zutil.obj : zutil.h zlib.h zconf.h
--- a/example.c
+++ b/example.c
@@ -10,20 +10,11 @@

 #ifdef STDC
 #  include <string.h>
+#  include <stdlib.h>
+#else
+   extern void exit  OF((int));
 #endif

-#ifndef __GO32__
-extern void exit  __P((int));
-#endif
-
-#define BUFLEN 4096
-
-#define local static
-/* For MSDOS and other systems with limitation on stack size. For Unix,
-    #define local
-   works also.
- */
-
 #define CHECK_ERR(err, msg) { \
    if (err != Z_OK) { \
        fprintf(stderr, "%s error: %d\n", msg, err); \
@@ -31,23 +22,34 @@ extern void exit  __P((int));
    } \
 }

-char *hello = "hello world";
+char *hello = "hello, hello!";
+/* "hello world" would be more standard, but the repeated "hello"
+ * stresses the compression code better, sorry...
+ */

-void test_compress __P((void));
-void test_gzio     __P((char *out, char *in));
-void test_deflate  __P((Byte compr[]));
-void test_inflate  __P((Byte compr[]));
-void main          __P((int argc, char *argv[]));
+void test_compress      OF((Bytef *compr, uLong comprLen,
+		            Bytef *uncompr, uLong uncomprLen));
+void test_gzio          OF((char *out, char *in, 
+		            Bytef *uncompr, int uncomprLen));
+void test_deflate       OF((Bytef *compr, uLong comprLen));
+void test_inflate       OF((Bytef *compr, uLong comprLen,
+		            Bytef *uncompr, uLong uncomprLen));
+void test_large_deflate OF((Bytef *compr, uLong comprLen,
+		            Bytef *uncompr, uLong uncomprLen));
+void test_large_inflate OF((Bytef *compr, uLong comprLen,
+		            Bytef *uncompr, uLong uncomprLen));
+void test_flush         OF((Bytef *compr, uLong comprLen));
+void test_sync          OF((Bytef *compr, uLong comprLen,
+		            Bytef *uncompr, uLong uncomprLen));
+int  main               OF((int argc, char *argv[]));

 /* ===========================================================================
 * Test compress() and uncompress()
 */
-void test_compress()
+void test_compress(compr, comprLen, uncompr, uncomprLen)
+    Bytef *compr, *uncompr;
+    uLong comprLen, uncomprLen;
 {
-    local Byte compr[BUFLEN];
-    uLong comprLen = sizeof(compr);
-    local Byte uncompr[BUFLEN];
-    uLong uncomprLen = sizeof(uncompr);
    int err;
    uLong len = strlen(hello)+1;

@@ -69,12 +71,12 @@ void test_compress()
 /* ===========================================================================
 * Test read/write of .gz files
 */
-void test_gzio(out, in)
+void test_gzio(out, in, uncompr, uncomprLen)
    char *out; /* output file */
    char *in;  /* input file */
+    Bytef *uncompr;
+    int  uncomprLen;
 {
-    local Byte uncompr[BUFLEN];
-    int uncomprLen = sizeof(uncompr);
    int err;
    int len = strlen(hello)+1;
    gzFile file;
@@ -112,8 +114,9 @@ void test_gzio(out, in)
 /* ===========================================================================
 * Test deflate() with small buffers
 */
-void test_deflate(compr)
-    Byte compr[];
+void test_deflate(compr, comprLen)
+    Bytef *compr;
+    uLong comprLen;
 {
    z_stream c_stream; /* compression stream */
    int err;
@@ -121,14 +124,15 @@ void test_deflate(compr)

    c_stream.zalloc = (alloc_func)0;
    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;

    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
    CHECK_ERR(err, "deflateInit");

-    c_stream.next_in  = (Byte*)hello;
+    c_stream.next_in  = (Bytef*)hello;
    c_stream.next_out = compr;

-    while (c_stream.total_in != (uLong)len) {
+    while (c_stream.total_in != (uLong)len && c_stream.total_out < comprLen) {
        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
        err = deflate(&c_stream, Z_NO_FLUSH);
        CHECK_ERR(err, "deflate");
@@ -148,10 +152,10 @@ void test_deflate(compr)
 /* ===========================================================================
 * Test inflate() with small buffers
 */
-void test_inflate(compr)
-    Byte compr[];
+void test_inflate(compr, comprLen, uncompr, uncomprLen)
+    Bytef *compr, *uncompr;
+    uLong comprLen, uncomprLen;
 {
-    local Byte uncompr[BUFLEN];
    int err;
    z_stream d_stream; /* decompression stream */

@@ -159,6 +163,7 @@ void test_inflate(compr)

    d_stream.zalloc = (alloc_func)0;
    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;

    err = inflateInit(&d_stream);
    CHECK_ERR(err, "inflateInit");
@@ -166,7 +171,7 @@ void test_inflate(compr)
    d_stream.next_in  = compr;
    d_stream.next_out = uncompr;

-    for (;;) {
+    while (d_stream.total_out < uncomprLen) {
        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
        err = inflate(&d_stream, Z_NO_FLUSH);
        if (err == Z_STREAM_END) break;
@@ -183,11 +188,105 @@ void test_inflate(compr)
    }
 }

+/* ===========================================================================
+ * Test deflate() with large buffers and dynamic change of compression level
+ */
+void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
+    Bytef *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_BEST_SPEED);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_out = compr;
+    c_stream.avail_out = comprLen;
+
+    /* At this point, uncompr is still mostly zeroes, so it should compress
+     * very well:
+     */
+    c_stream.next_in = uncompr;
+    c_stream.avail_in = (uInt)uncomprLen;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+    if (c_stream.avail_in != 0) {
+        fprintf(stderr, "deflate not greedy\n");
+    }
+
+    /* Feed in already compressed data and switch to no compression: */
+    deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
+    c_stream.next_in = compr;
+    c_stream.avail_in = (uInt)comprLen/2;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    /* Switch back to compressing mode: */
+    deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
+    c_stream.next_in = uncompr;
+    c_stream.avail_in = (uInt)uncomprLen;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "deflate should report Z_STREAM_END\n");
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with large buffers
+ */
+void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
+    Bytef *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = (uInt)comprLen;
+
+    for (;;) {
+        d_stream.next_out = uncompr;            /* discard the output */
+	d_stream.avail_out = uncomprLen;
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "large inflate");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
+        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
+    } else {
+        printf("large_inflate(): OK\n");
+    }
+}
+
 /* ===========================================================================
 * Test deflate() with full flush
 */
-void test_flush(compr)
-    Byte compr[];
+void test_flush(compr, comprLen)
+    Bytef *compr;
+    uLong comprLen;
 {
    z_stream c_stream; /* compression stream */
    int err;
@@ -195,14 +294,15 @@ void test_flush(compr)

    c_stream.zalloc = (alloc_func)0;
    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;

    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
    CHECK_ERR(err, "deflateInit");

-    c_stream.next_in  = (Byte*)hello;
+    c_stream.next_in  = (Bytef*)hello;
    c_stream.next_out = compr;
    c_stream.avail_in = 3;
-    c_stream.avail_out = BUFLEN;
+    c_stream.avail_out = (uInt)comprLen;
    err = deflate(&c_stream, Z_FULL_FLUSH);
    CHECK_ERR(err, "deflate");

@@ -220,10 +320,10 @@ void test_flush(compr)
 /* ===========================================================================
 * Test inflateSync()
 */
-void test_sync(compr)
-    Byte compr[];
+void test_sync(compr, comprLen, uncompr, uncomprLen)
+    Bytef *compr, *uncompr;
+    uLong comprLen, uncomprLen;
 {
-    local Byte uncompr[BUFLEN];
    int err;
    z_stream d_stream; /* decompression stream */

@@ -231,6 +331,7 @@ void test_sync(compr)

    d_stream.zalloc = (alloc_func)0;
    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;

    err = inflateInit(&d_stream);
    CHECK_ERR(err, "inflateInit");
@@ -238,13 +339,13 @@ void test_sync(compr)
    d_stream.next_in  = compr;
    d_stream.next_out = uncompr;
    d_stream.avail_in = 2; /* just read the zlib header */
-    d_stream.avail_out = sizeof(uncompr);
+    d_stream.avail_out = (uInt)uncomprLen;

    inflate(&d_stream, Z_NO_FLUSH);
    CHECK_ERR(err, "inflate");

-    d_stream.avail_in = BUFLEN-2; /* let inflate read all compressed data */
-    err = inflateSync(&d_stream); /* skip the damaged part */
+    d_stream.avail_in = (uInt)uncomprLen-2; /* read all compressed data */
+    err = inflateSync(&d_stream);           /* but skip the damaged part */
    CHECK_ERR(err, "inflateSync");

    err = inflate(&d_stream, Z_FINISH);
@@ -262,11 +363,13 @@ void test_sync(compr)
 * Usage:  example [output.gz  [input.gz]]
 */

-void main(argc, argv)
+int main(argc, argv)
    int argc;
    char *argv[];
 {
-    local Byte compr[BUFLEN];
+    Bytef *compr, *uncompr;
+    uLong comprLen = 32750*sizeof(int); /* don't overflow on MSDOS */
+    uLong uncomprLen = comprLen;

    if (zlib_version[0] != ZLIB_VERSION[0]) {
        fprintf(stderr, "incompatible zlib version\n");
@@ -275,16 +378,29 @@ void main(argc, argv)
    } else if (strcmp(zlib_version, ZLIB_VERSION) != 0) {
        fprintf(stderr, "warning: different zlib version\n");
    }
-    test_compress();
+
+    compr    = (Bytef*)malloc(comprLen);
+    uncompr  = (Bytef*)calloc(uncomprLen, 1); /* must be cleared initially */
+    if (compr == Z_NULL || uncompr == Z_NULL) {
+        printf("out of memory\n");
+	exit(1);
+    }
+
+    test_compress(compr, comprLen, uncompr, uncomprLen);

    test_gzio((argc > 1 ? argv[1] : "foo.gz"),
-              (argc > 2 ? argv[2] : "foo.gz"));
+              (argc > 2 ? argv[2] : "foo.gz"),
+	      uncompr, (int)uncomprLen);

-    test_deflate(compr);
-    test_inflate(compr);
+    test_deflate(compr, comprLen);
+    test_inflate(compr, comprLen, uncompr, uncomprLen);

-    test_flush(compr);
-    test_sync(compr);
+    test_large_deflate(compr, comprLen, uncompr, uncomprLen);
+    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    test_flush(compr, comprLen);
+    test_sync(compr, comprLen, uncompr, uncomprLen);

    exit(0);
+    return 0; /* to avoid warning */
 }
--- a/gzio.c
+++ b/gzio.c
@@ -13,8 +13,8 @@ struct internal_state {int dummy;}; /* for buggy compilers */

 #define Z_BUFSIZE 4096

-#define ALLOC(size) zcalloc((voidp)0, 1, size)
-#define TRYFREE(p) {if (p) zcfree((voidp)0, p);}
+#define ALLOC(size) malloc(size)
+#define TRYFREE(p) {if (p) free(p);}

 #define GZ_MAGIC_1 0x1f
 #define GZ_MAGIC_2 0x8b
@@ -46,10 +46,10 @@ typedef struct gz_stream {
 } gz_stream;


-local int    destroy __P((gz_stream *s));
-local gzFile gz_open __P((char *path, char *mode, int  fd));
-local void   putLong __P((FILE *file, uLong x));
-local uLong  getLong __P((Byte *buf));
+local int    destroy OF((gz_stream *s));
+local gzFile gz_open OF((char *path, char *mode, int  fd));
+local void   putLong OF((FILE *file, uLong x));
+local uLong  getLong OF((Bytef *buf));

 /* ===========================================================================
 * Cleanup then free the given gz_stream. Return a zlib error code.
@@ -77,13 +77,13 @@ local int destroy (s)
        err = Z_ERRNO;
    }
    if (s->z_err < 0) err = s->z_err;
-    zcfree((voidp)0, s);
+    TRYFREE(s);
    return err;
 }

 /* ===========================================================================
     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb"). The file is given either by file descritor
+   is as in fopen ("rb" or "wb"). The file is given either by file descriptor
   or path name (if fd == -1).
     gz_open return NULL if the file could not be opened or if there was
   insufficient memory to allocate the (de)compression state; errno
@@ -96,6 +96,7 @@ local gzFile gz_open (path, mode, fd)
    int  fd;
 {
    int err;
+    int level = Z_DEFAULT_COMPRESSION; /* compression level */
    char *p = mode;
    gz_stream *s = (gz_stream *)ALLOC(sizeof(gz_stream));

@@ -103,6 +104,7 @@ local gzFile gz_open (path, mode, fd)

    s->stream.zalloc = (alloc_func)0;
    s->stream.zfree = (free_func)0;
+    s->stream.opaque = (voidpf)0;
    s->stream.next_in = s->inbuf = Z_NULL;
    s->stream.next_out = s->outbuf = Z_NULL;
    s->stream.avail_in = s->stream.avail_out = 0;
@@ -123,22 +125,23 @@ local gzFile gz_open (path, mode, fd)
    do {
        if (*p == 'r') s->mode = 'r';
        if (*p == 'w') s->mode = 'w';
+        if (*p >= '1' && *p <= '9') level = *p - '0';
    } while (*p++);
    if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
    
    if (s->mode == 'w') {
-        err = deflateInit2(&(s->stream), Z_DEFAULT_COMPRESSION,
-                           DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, 0);
+        err = deflateInit2(&(s->stream), level,
+                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, 0);
        /* windowBits is passed < 0 to suppress zlib header */

-        s->stream.next_out = s->outbuf = ALLOC(Z_BUFSIZE);
+        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);

        if (err != Z_OK || s->outbuf == Z_NULL) {
            return destroy(s), (gzFile)Z_NULL;
        }
    } else {
        err = inflateInit2(&(s->stream), -MAX_WBITS);
-        s->stream.next_in  = s->inbuf = ALLOC(Z_BUFSIZE);
+        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);

        if (err != Z_OK || s->inbuf == Z_NULL) {
            return destroy(s), (gzFile)Z_NULL;
@@ -147,7 +150,7 @@ local gzFile gz_open (path, mode, fd)
    s->stream.avail_out = Z_BUFSIZE;

    errno = 0;
-    s->file = fd < 0 ? FOPEN(path, mode) : fdopen(fd, mode);
+    s->file = fd < 0 ? FOPEN(path, mode) : (FILE*)fdopen(fd, mode);

    if (s->file == NULL) {
        return destroy(s), (gzFile)Z_NULL;
@@ -156,7 +159,7 @@ local gzFile gz_open (path, mode, fd)
        /* Write a very simple .gz header:
         */
        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", GZ_MAGIC_1, GZ_MAGIC_2,
-               DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
+             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
    } else {
        /* Check and skip the header:
         */
@@ -177,7 +180,7 @@ local gzFile gz_open (path, mode, fd)
        s->stream.avail_in = 0;
        fscanf(s->file,"%c%c%4c%c%c", &method, &flags, time, &xflags, &osCode);

-        if (method != DEFLATED || feof(s->file) || (flags & RESERVED) != 0) {
+        if (method != Z_DEFLATED || feof(s->file) || (flags & RESERVED) != 0) {
            s->z_err = Z_DATA_ERROR;
            return (gzFile)s;
        }
@@ -240,7 +243,7 @@ int gzread (file, buf, len)
    if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;

    if (s->transparent) {
-        unsigned n = 0;
+        int n = 0;
        Byte *b = (Byte*)buf;
        /* Copy the first two (non-magic) bytes if not done already */
        while (s->stream.avail_in > 0 && len > 0) {
@@ -281,7 +284,7 @@ int gzread (file, buf, len)
    }
    len -= s->stream.avail_out;
    s->crc = crc32(s->crc, buf, len);
-    return len;
+    return (int)len;
 }

 /* ===========================================================================
@@ -312,12 +315,11 @@ int gzwrite (file, buf, len)
            s->stream.avail_out = Z_BUFSIZE;
        }
        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
-
        if (s->z_err != Z_OK) break;
    }
    s->crc = crc32(s->crc, buf, len);

-    return len - s->stream.avail_in;
+    return (int)(len - s->stream.avail_in);
 }

 /* ===========================================================================
@@ -359,6 +361,7 @@ int gzflush (file, flush)
 
        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
    }
+    fflush(s->file);
    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
 }

@@ -380,10 +383,10 @@ local void putLong (file, x)
   Reads a long in LSB order from the given buffer
 */
 local uLong getLong (buf)
-    Byte *buf;
+    Bytef *buf;
 {
    uLong x = 0;
-    Byte *p = buf+4;
+    Bytef *p = buf+4;

    do {
        x <<= 8;
@@ -417,7 +420,7 @@ int gzclose (file)
        /* slide CRC and original size if they are at the end of inbuf */
        if ((n = s->stream.avail_in) < 8  && !s->z_eof) {
            Byte *p = s->inbuf;
-            Byte *q = s->stream.next_in;
+	    Bytef *q = s->stream.next_in;
            while (n--) { *p++ = *q++; };

            n = s->stream.avail_in;
--- a/infblock.c
+++ b/infblock.c
@@ -62,9 +62,9 @@ local uInt border[] = { /* Order of the bit length code lengths */


 void inflate_blocks_reset(s, z, c)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
-uLong *c;
+uLongf *c;
 {
  if (s->checkfn != Z_NULL)
    *c = s->check;
@@ -86,17 +86,17 @@ uLong *c;
 }


-struct inflate_blocks_state *inflate_blocks_new(z, c, w)
+inflate_blocks_statef *inflate_blocks_new(z, c, w)
 z_stream *z;
 check_func c;
 uInt w;
 {
-  struct inflate_blocks_state *s;
+  inflate_blocks_statef *s;

-  if ((s = (struct inflate_blocks_state *)ZALLOC
+  if ((s = (inflate_blocks_statef *)ZALLOC
       (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
    return s;
-  if ((s->window = (Byte *)ZALLOC(z, 1, w)) == Z_NULL)
+  if ((s->window = (Bytef *)ZALLOC(z, 1, w)) == Z_NULL)
  {
    ZFREE(z, s);
    return Z_NULL;
@@ -111,16 +111,16 @@ uInt w;


 int inflate_blocks(s, z, r)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
 int r;
 {
  uInt t;               /* temporary storage */
  uLong b;              /* bit buffer */
  uInt k;               /* bits in bit buffer */
-  Byte *p;              /* input data pointer */
+  Bytef *p;             /* input data pointer */
  uInt n;               /* bytes available there */
-  Byte *q;              /* output window write pointer */
+  Bytef *q;             /* output window write pointer */
  uInt m;               /* bytes to end of window or read pointer */

  /* copy input/output information to locals (UPDATE macro restores) */
@@ -179,7 +179,7 @@ int r;
      break;
    case LENS:
      NEEDBITS(32)
-      if ((~b) >> 16 != (b & 0xffff))
+      if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
      {
        s->mode = BAD;
        z->msg = "invalid stored block lengths";
@@ -223,7 +223,7 @@ int r;
      t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
      if (t < 19)
        t = 19;
-      if ((s->sub.trees.blens = (uInt*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
+      if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
      {
        r = Z_MEM_ERROR;
        LEAVE
@@ -301,10 +301,10 @@ int r;
      {
        uInt bl, bd;
        inflate_huft *tl, *td;
-        struct inflate_codes_state *c;
+        inflate_codes_statef *c;

-        bl = 9;
-        bd = 6;
+        bl = 9;         /* must be <= 9 for lookahead assumptions */
+        bd = 6;         /* must be <= 9 for lookahead assumptions */
        t = s->sub.trees.table;
        t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
                                  s->sub.trees.blens, &bl, &bd, &tl, &td, z);
@@ -373,9 +373,9 @@ int r;


 int inflate_blocks_free(s, z, c)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
-uLong *c;
+uLongf *c;
 {
  inflate_blocks_reset(s, z, c);
  ZFREE(z, s->window);
--- a/infblock.h
+++ b/infblock.h
@@ -9,23 +9,24 @@
 */

 struct inflate_blocks_state;
+typedef struct inflate_blocks_state FAR inflate_blocks_statef;

-extern struct inflate_blocks_state * inflate_blocks_new __P((
-    z_stream *,
-    check_func,                 /* check function */
-    uInt));                     /* window size */
+extern inflate_blocks_statef * inflate_blocks_new OF((
+    z_stream *z,
+    check_func c,               /* check function */
+    uInt w));                   /* window size */

-extern int inflate_blocks __P((
-    struct inflate_blocks_state *,
+extern int inflate_blocks OF((
+    inflate_blocks_statef *,
    z_stream *,
    int));                      /* initial return code */

-extern void inflate_blocks_reset __P((
-    struct inflate_blocks_state *,
+extern void inflate_blocks_reset OF((
+    inflate_blocks_statef *,
    z_stream *,
-    uLong *));                  /* check value on output */
+    uLongf *));                  /* check value on output */

-extern int inflate_blocks_free __P((
-    struct inflate_blocks_state *,
+extern int inflate_blocks_free OF((
+    inflate_blocks_statef *,
    z_stream *,
-    uLong *));                  /* check value on output */
+    uLongf *));                  /* check value on output */
--- a/infcodes.c
+++ b/infcodes.c
@@ -5,9 +5,10 @@

 #include "zutil.h"
 #include "inftrees.h"
+#include "infblock.h"
+#include "infcodes.h"
 #include "infutil.h"
 #include "inffast.h"
-#include "infcodes.h"

 /* simplify the use of the inflate_huft type with some defines */
 #define base more.Base
@@ -55,14 +56,14 @@ struct inflate_codes_state {
 };


-struct inflate_codes_state *inflate_codes_new(bl, bd, tl, td, z)
+inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z)
 uInt bl, bd;
 inflate_huft *tl, *td;
 z_stream *z;
 {
-  struct inflate_codes_state *c;
+  inflate_codes_statef *c;

-  if ((c = (struct inflate_codes_state *)
+  if ((c = (inflate_codes_statef *)
       ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL)
  {
    c->mode = START;
@@ -77,7 +78,7 @@ z_stream *z;


 int inflate_codes(s, z, r)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
 int r;
 {
@@ -86,12 +87,12 @@ int r;
  uInt e;               /* extra bits or operation */
  uLong b;              /* bit buffer */
  uInt k;               /* bits in bit buffer */
-  Byte *p;              /* input data pointer */
+  Bytef *p;             /* input data pointer */
  uInt n;               /* bytes available there */
-  Byte *q;              /* output window write pointer */
+  Bytef *q;             /* output window write pointer */
  uInt m;               /* bytes to end of window or read pointer */
-  Byte *f;              /* pointer to copy strings from */
-  struct inflate_codes_state *c = s->sub.decode.codes;  /* codes state */
+  Bytef *f;             /* pointer to copy strings from */
+  inflate_codes_statef *c = s->sub.decode.codes;  /* codes state */

  /* copy input/output information to locals (UPDATE macro restores) */
  LOAD
@@ -194,9 +195,15 @@ int r;
      Tracevv((stderr, "inflate:         distance %u\n", c->sub.copy.dist));
      c->mode = COPY;
    case COPY:          /* o: copying bytes in window, waiting for space */
+#ifndef __TURBOC__ /* Turbo C bug for following expression */
      f = (uInt)(q - s->window) < c->sub.copy.dist ?
          s->end - (c->sub.copy.dist - (q - s->window)) :
          q - c->sub.copy.dist;
+#else
+      f = q - c->sub.copy.dist;
+      if ((uInt)(q - s->window) < c->sub.copy.dist)
+        f = s->end - (c->sub.copy.dist - (uInt)(q - s->window));
+#endif
      while (c->len)
      {
        NEEDOUT
@@ -231,7 +238,7 @@ int r;


 void inflate_codes_free(c, z)
-struct inflate_codes_state *c;
+inflate_codes_statef *c;
 z_stream *z;
 {
  ZFREE(z, c);
--- a/infcodes.h
+++ b/infcodes.h
@@ -9,17 +9,19 @@
 */

 struct inflate_codes_state;
+typedef struct inflate_codes_state FAR inflate_codes_statef;

-extern struct inflate_codes_state *inflate_codes_new __P((
+extern inflate_codes_statef *inflate_codes_new OF((
    uInt, uInt,
    inflate_huft *, inflate_huft *,
    z_stream *));

-extern int inflate_codes __P((
-    struct inflate_blocks_state *,
+extern int inflate_codes OF((
+    inflate_blocks_statef *,
    z_stream *,
    int));

-extern void inflate_codes_free __P((
-    struct inflate_codes_state *,
+extern void inflate_codes_free OF((
+    inflate_codes_statef *,
    z_stream *));
+
--- a/inffast.c
+++ b/inffast.c
@@ -5,6 +5,8 @@

 #include "zutil.h"
 #include "inftrees.h"
+#include "infblock.h"
+#include "infcodes.h"
 #include "infutil.h"
 #include "inffast.h"

@@ -28,22 +30,22 @@ struct inflate_codes_state {int dummy;}; /* for buggy compilers */
 int inflate_fast(bl, bd, tl, td, s, z)
 uInt bl, bd;
 inflate_huft *tl, *td;
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
 {
  inflate_huft *t;      /* temporary pointer */
  uInt e;               /* extra bits or operation */
  uLong b;              /* bit buffer */
  uInt k;               /* bits in bit buffer */
-  Byte *p;              /* input data pointer */
+  Bytef *p;             /* input data pointer */
  uInt n;               /* bytes available there */
-  Byte *q;              /* output window write pointer */
+  Bytef *q;             /* output window write pointer */
  uInt m;               /* bytes to end of window or read pointer */
  uInt ml;              /* mask for literal/length tree */
  uInt md;              /* mask for distance tree */
  uInt c;               /* bytes to copy */
  uInt d;               /* distance back to copy from */
-  Byte *r;              /* copy source pointer */
+  Bytef *r;             /* copy source pointer */

  /* load input, output, bit values */
  LOAD
@@ -100,7 +102,7 @@ z_stream *z;
            }
            else                        /* else offset after destination */
            {
-              e = d - (q - s->window);  /* bytes from offset to end */
+              e = d - (uInt)(q - s->window); /* bytes from offset to end */
              r = s->end - e;           /* pointer to offset */
              if (c > e)                /* if source crosses, */
              {
--- a/inffast.h
+++ b/inffast.h
@@ -8,10 +8,10 @@
   subject to change. Applications should only use zlib.h.
 */

-extern int inflate_fast __P((
+extern int inflate_fast OF((
    uInt,
    uInt,
    inflate_huft *,
    inflate_huft *,
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
    z_stream *));
--- a/inflate.c
+++ b/inflate.c
@@ -37,7 +37,7 @@ struct internal_state {
  /* mode independent information */
  int  nowrap;          /* flag for no wrapper */
  uInt wbits;           /* log2(window size)  (8..15, defaults to 15) */
-  struct inflate_blocks_state
+  inflate_blocks_statef 
    *blocks;            /* current inflate_blocks state */

 };
@@ -82,9 +82,14 @@ int w;
  /* initialize state */
  if (z == Z_NULL)
    return Z_STREAM_ERROR;
-  if (z->zalloc == Z_NULL) z->zalloc = zcalloc;
+  z->msg = Z_NULL;
+  if (z->zalloc == Z_NULL)
+  {
+    z->zalloc = zcalloc;
+    z->opaque = (voidpf)0;
+  }
  if (z->zfree == Z_NULL) z->zfree = zcfree;
-  if ((z->state = (struct internal_state *)
+  if ((z->state = (struct internal_state FAR *)
       ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL)
    return Z_MEM_ERROR;
  z->state->blocks = Z_NULL;
@@ -145,7 +150,7 @@ int f;
  {
    case METHOD:
      NEEDBYTE
-      if (((z->state->sub.method = NEXTBYTE) & 0xf) != DEFLATED)
+      if (((z->state->sub.method = NEXTBYTE) & 0xf) != Z_DEFLATED)
      {
        z->state->mode = BAD;
        z->msg = "unknown compression method";
@@ -235,7 +240,7 @@ int inflateSync(z)
 z_stream *z;
 {
  uInt n;       /* number of bytes to look at */
-  Byte *p;      /* pointer to bytes */
+  Bytef *p;     /* pointer to bytes */
  uInt m;       /* number of marker bytes found in a row */
  uLong r, w;   /* temporaries to save total_in and total_out */

--- a/inftrees.c
+++ b/inftrees.c
@@ -6,6 +6,13 @@
 #include "zutil.h"
 #include "inftrees.h"

+char inflate_copyright[] = " inflate 1.0 Copyright 1995 Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
 struct internal_state  {int dummy;}; /* for buggy compilers */

 /* simplify the use of the inflate_huft type with some defines */
@@ -15,25 +22,21 @@ struct internal_state  {int dummy;}; /* for buggy compilers */
 #define bits word.what.Bits


-local int huft_build __P((
-    uInt *,             /* code lengths in bits */
+local int huft_build OF((
+    uIntf *,            /* code lengths in bits */
    uInt,               /* number of codes */
    uInt,               /* number of "simple" codes */
-    uInt *,             /* list of base values for non-simple codes */
-    uInt *,             /* list of extra bits for non-simple codes */
-    inflate_huft **,    /* result: starting table */
-    uInt *,             /* maximum lookup bits (returns actual) */
+    uIntf *,            /* list of base values for non-simple codes */
+    uIntf *,            /* list of extra bits for non-simple codes */
+    inflate_huft * FAR*,/* result: starting table */
+    uIntf *,            /* maximum lookup bits (returns actual) */
    z_stream *));       /* for zalloc function */

-local voidp falloc __P((
-    voidp,              /* opaque pointer (not used) */
+local voidpf falloc OF((
+    voidpf,             /* opaque pointer (not used) */
    uInt,               /* number of items */
    uInt));             /* size of item */

-local void ffree __P((
-    voidp q,            /* opaque pointer (not used) */
-    voidp p));          /* what to free (not used) */
-
 /* Tables for deflate from PKZIP's appnote.txt. */
 local uInt cplens[] = { /* Copy lengths for literal codes 257..285 */
        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
@@ -93,13 +96,13 @@ local uInt cpdext[] = { /* Extra bits for distance codes */
 #endif

 local int huft_build(b, n, s, d, e, t, m, zs)
-uInt *b;                /* code lengths in bits (all assumed <= BMAX) */
+uIntf *b;               /* code lengths in bits (all assumed <= BMAX) */
 uInt n;                 /* number of codes (assumed <= N_MAX) */
 uInt s;                 /* number of simple-valued codes (0..s-1) */
-uInt *d;                /* list of base values for non-simple codes */
-uInt *e;                /* list of extra bits for non-simple codes */
-inflate_huft **t;       /* result: starting table */
-uInt *m;                /* maximum lookup bits, returns actual */
+uIntf *d;               /* list of base values for non-simple codes */
+uIntf *e;               /* list of extra bits for non-simple codes */  
+inflate_huft * FAR *t;  /* result: starting table */
+uIntf *m;               /* maximum lookup bits, returns actual */
 z_stream *zs;           /* for zalloc function */
 /* Given a list of code lengths and a maximum table size, make a set of
   tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
@@ -107,6 +110,7 @@ z_stream *zs;           /* for zalloc function */
   case), Z_DATA_ERROR if the input is invalid (all zero length codes or an
   over-subscribed set of lengths), or Z_MEM_ERROR if not enough memory. */
 {
+
  uInt a;                       /* counter for codes of length k */
  uInt c[BMAX+1];               /* bit length count table */
  uInt f;                       /* i repeats in table every f entries */
@@ -116,14 +120,14 @@ z_stream *zs;           /* for zalloc function */
  register uInt j;              /* counter */
  register int k;               /* number of bits in current code */
  int l;                        /* bits per table (returned in m) */
-  register uInt *p;             /* pointer into c[], b[], or v[] */
-  register inflate_huft *q;     /* points to current table */
-  inflate_huft r;               /* table entry for structure assignment */
+  register uIntf *p;            /* pointer into c[], b[], or v[] */
+  inflate_huft *q;              /* points to current table */
+  struct inflate_huft_s r;      /* table entry for structure assignment */
  inflate_huft *u[BMAX];        /* table stack */
  uInt v[N_MAX];                /* values in order of bit length */
  register int w;               /* bits before this table == (l * h) */
  uInt x[BMAX+1];               /* bit offsets, then code stack */
-  uInt *xp;                     /* pointer into x */
+  uIntf *xp;                    /* pointer into x */
  int y;                        /* number of dummy codes added */
  uInt z;                       /* number of entries in current table */

@@ -238,7 +242,7 @@ z_stream *zs;           /* for zalloc function */
        inflate_hufts += z + 1;
 #endif
        *t = q + 1;             /* link to list for huft_free() */
-        *(t = &(q->next)) = (inflate_huft *)Z_NULL;
+        *(t = &(q->next)) = Z_NULL;
        u[h] = ++q;             /* table starts after link */

        /* connect to last table, if there is one */
@@ -246,7 +250,7 @@ z_stream *zs;           /* for zalloc function */
        {
          x[h] = i;             /* save pattern for backing up */
          r.bits = (Byte)l;     /* bits to dump before this table */
-          r.exop = j;           /* bits in this table */
+          r.exop = (Byte)j;     /* bits in this table */
          r.next = q;           /* pointer to this table */
          j = i >> (w - l);     /* (get around Turbo C bug) */
          u[h-1][j] = r;        /* connect to last table */
@@ -259,12 +263,12 @@ z_stream *zs;           /* for zalloc function */
        r.exop = 128 + 64;      /* out of values--invalid code */
      else if (*p < s)
      {
-        r.exop = (*p < 256 ? 0 : 32 + 64);      /* 256 is end-of-block */
+        r.exop = (Byte)(*p < 256 ? 0 : 32 + 64);     /* 256 is end-of-block */
        r.base = *p++;          /* simple code is just the value */
      }
      else
      {
-        r.exop = e[*p - s] + 16 + 64;   /* non-simple--look up in lists */
+        r.exop = (Byte)e[*p - s] + 16 + 64; /* non-simple--look up in lists */
        r.base = d[*p++ - s];
      }

@@ -294,14 +298,14 @@ z_stream *zs;           /* for zalloc function */


 int inflate_trees_bits(c, bb, tb, z)
-uInt *c;                /* 19 code lengths */
-uInt *bb;               /* bits tree desired/actual depth */
-inflate_huft **tb;      /* bits tree result */
+uIntf *c;               /* 19 code lengths */
+uIntf *bb;              /* bits tree desired/actual depth */
+inflate_huft * FAR *tb; /* bits tree result */
 z_stream *z;            /* for zfree function */
 {
  int r;

-  r = huft_build(c, 19, 19, (uInt*)Z_NULL, (uInt*)Z_NULL, tb, bb, z);
+  r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL, tb, bb, z);
  if (r == Z_DATA_ERROR)
    z->msg = "oversubscribed dynamic bit lengths tree";
  else if (r == Z_BUF_ERROR)
@@ -317,11 +321,11 @@ z_stream *z;            /* for zfree function */
 int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, z)
 uInt nl;                /* number of literal/length codes */
 uInt nd;                /* number of distance codes */
-uInt *c;                /* that many (total) code lengths */
-uInt *bl;               /* literal desired/actual bit depth */
-uInt *bd;               /* distance desired/actual bit depth */
-inflate_huft **tl;      /* literal/length tree result */
-inflate_huft **td;      /* distance tree result */
+uIntf *c;               /* that many (total) code lengths */
+uIntf *bl;              /* literal desired/actual bit depth */
+uIntf *bd;              /* distance desired/actual bit depth */
+inflate_huft * FAR *tl; /* literal/length tree result */
+inflate_huft * FAR *td; /* distance tree result */
 z_stream *z;            /* for zfree function */
 {
  int r;
@@ -365,10 +369,8 @@ z_stream *z;            /* for zfree function */


 /* build fixed tables only once--keep them here */
-local int fixed_lock = 0;
 local int fixed_built = 0;
 #define FIXEDH 530      /* number of hufts used by fixed tables */
-local uInt fixed_left = FIXEDH;
 local inflate_huft fixed_mem[FIXEDH];
 local uInt fixed_bl;
 local uInt fixed_bd;
@@ -376,47 +378,36 @@ local inflate_huft *fixed_tl;
 local inflate_huft *fixed_td;


-local voidp falloc(q, n, s)
-voidp q;        /* opaque pointer (not used) */
+local voidpf falloc(q, n, s)
+voidpf q;       /* opaque pointer */
 uInt n;         /* number of items */
 uInt s;         /* size of item */
 {
-  Assert(s == sizeof(inflate_huft) && n <= fixed_left,
+  Assert(s == sizeof(inflate_huft) && n <= *(intf *)q,
         "inflate_trees falloc overflow");
-  if (q) s++; /* to make some compilers happy */
-  fixed_left -= n;
-  return (voidp)(fixed_mem + fixed_left);
-}
-
-
-local void ffree(q, p)
-voidp q;
-voidp p;
-{
-  Assert(0, "inflate_trees ffree called!");
-  if (q) q = p; /* to make some compilers happy */
+  *(intf *)q -= n;
+  return (voidpf)(fixed_mem + *(intf *)q);
 }


 int inflate_trees_fixed(bl, bd, tl, td)
-uInt *bl;               /* literal desired/actual bit depth */
-uInt *bd;               /* distance desired/actual bit depth */
-inflate_huft **tl;      /* literal/length tree result */
-inflate_huft **td;      /* distance tree result */
+uIntf *bl;               /* literal desired/actual bit depth */
+uIntf *bd;               /* distance desired/actual bit depth */
+inflate_huft * FAR *tl;  /* literal/length tree result */
+inflate_huft * FAR *td;  /* distance tree result */
 {
-  /* build fixed tables if not built already--lock out other instances */
-  while (++fixed_lock > 1)
-    fixed_lock--;
+  /* build fixed tables if not already (multiple overlapped executions ok) */
  if (!fixed_built)
  {
    int k;              /* temporary variable */
    unsigned c[288];    /* length list for huft_build */
    z_stream z;         /* for falloc function */
+    int f = FIXEDH;     /* number of hufts left in fixed_mem */

    /* set up fake z_stream for memory routines */
    z.zalloc = falloc;
-    z.zfree = ffree;
-    z.opaque = Z_NULL;
+    z.zfree = Z_NULL;
+    z.opaque = (voidpf)&f;

    /* literal table */
    for (k = 0; k < 144; k++)
@@ -437,9 +428,9 @@ inflate_huft **td;      /* distance tree result */
    huft_build(c, 30, 0, cpdist, cpdext, &fixed_td, &fixed_bd, &z);

    /* done */
+    Assert(f == 0, "invalid build of fixed tables");
    fixed_built = 1;
  }
-  fixed_lock--;
  *bl = fixed_bl;
  *bd = fixed_bd;
  *tl = fixed_tl;
@@ -455,10 +446,19 @@ z_stream *z;            /* for zfree function */
   list of the tables it made, with the links in a dummy first entry of
   each table. */
 {
-  register inflate_huft *p, *q;
+  register inflate_huft *p, *q, *r;

+  /* Reverse linked list */
+  p = Z_NULL;
+  q = t;
+  while (q != Z_NULL)
+  {
+    r = (q - 1)->next;
+    (q - 1)->next = p;
+    p = q;
+    q = r;
+  }
  /* Go through linked list, freeing from the malloced (t[-1]) address. */
-  p = t;
  while (p != Z_NULL)
  {
    q = (--p)->next;
--- a/inftrees.h
+++ b/inftrees.h
@@ -11,14 +11,15 @@
 /* Huffman code lookup table entry--this entry is four bytes for machines
   that have 16-bit pointers (e.g. PC's in the small or medium model). */

-typedef struct inflate_huft_s inflate_huft;
+typedef struct inflate_huft_s FAR inflate_huft;
+
 struct inflate_huft_s {
  union {
    struct {
      Byte Exop;        /* number of extra bits or operation */
      Byte Bits;        /* number of bits in this code or subcode */
    } what;
-    Byte *pad;          /* pad structure to a power of 2 (4 bytes for */
+    Bytef *pad;         /* pad structure to a power of 2 (4 bytes for */
  } word;               /*  16-bit, 8 bytes for 32-bit machines) */
  union {
    uInt Base;          /* literal, length base, or distance base */
@@ -30,28 +31,29 @@ struct inflate_huft_s {
  extern uInt inflate_hufts;
 #endif

-extern int inflate_trees_bits __P((
-    uInt *,                     /* 19 code lengths */
-    uInt *,                     /* bits tree desired/actual depth */
-    inflate_huft **,            /* bits tree result */
+extern int inflate_trees_bits OF((
+    uIntf *,                    /* 19 code lengths */
+    uIntf *,                    /* bits tree desired/actual depth */
+    inflate_huft * FAR *,       /* bits tree result */
    z_stream *));               /* for zalloc, zfree functions */

-extern int inflate_trees_dynamic __P((
+extern int inflate_trees_dynamic OF((
    uInt,                       /* number of literal/length codes */
    uInt,                       /* number of distance codes */
-    uInt *,                     /* that many (total) code lengths */
-    uInt *,                     /* literal desired/actual bit depth */
-    uInt *,                     /* distance desired/actual bit depth */
-    inflate_huft **,            /* literal/length tree result */
-    inflate_huft **,            /* distance tree result */
+    uIntf *,                    /* that many (total) code lengths */
+    uIntf *,                    /* literal desired/actual bit depth */
+    uIntf *,                    /* distance desired/actual bit depth */
+    inflate_huft * FAR *,       /* literal/length tree result */
+    inflate_huft * FAR *,       /* distance tree result */
    z_stream *));               /* for zalloc, zfree functions */

-extern int inflate_trees_fixed __P((
-    uInt *,                     /* literal desired/actual bit depth */
-    uInt *,                     /* distance desired/actual bit depth */
-    inflate_huft **,            /* literal/length tree result */
-    inflate_huft **));          /* distance tree result */
+extern int inflate_trees_fixed OF((
+    uIntf *,                    /* literal desired/actual bit depth */
+    uIntf *,                    /* distance desired/actual bit depth */
+    inflate_huft * FAR *,       /* literal/length tree result */
+    inflate_huft * FAR *));     /* distance tree result */

-extern int inflate_trees_free __P((
+extern int inflate_trees_free OF((
    inflate_huft *,             /* tables to free */
    z_stream *));               /* for zfree function */
+
--- a/infutil.c
+++ b/infutil.c
@@ -4,7 +4,9 @@
 */

 #include "zutil.h"
+#include "infblock.h"
 #include "inftrees.h"
+#include "infcodes.h"
 #include "infutil.h"

 struct inflate_codes_state {int dummy;}; /* for buggy compilers */
@@ -19,12 +21,12 @@ uInt inflate_mask[] = {

 /* copy as much as possible from the sliding window to the output area */
 int inflate_flush(s, z, r)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
 int r;
 {
  uInt n;
-  Byte *p, *q;
+  Bytef *p, *q;

  /* local copies of source and destination pointers */
  p = z->next_out;
--- a/infutil.h
+++ b/infutil.h
@@ -31,13 +31,13 @@ struct inflate_blocks_state {
    struct {
      uInt table;               /* table lengths (14 bits) */
      uInt index;               /* index into blens (or border) */
-      uInt *blens;              /* bit lengths of codes */
+      uIntf *blens;             /* bit lengths of codes */
      uInt bb;                  /* bit length tree depth */
      inflate_huft *tb;         /* bit length decoding tree */
    } trees;            /* if DTREE, decoding info for trees */
    struct {
      inflate_huft *tl, *td;    /* trees to free */
-      struct inflate_codes_state
+      inflate_codes_statef 
         *codes;
    } decode;           /* if CODES, current state */
  } sub;                /* submode */
@@ -46,15 +46,16 @@ struct inflate_blocks_state {
  /* mode independent information */
  uInt bitk;            /* bits in bit buffer */
  uLong bitb;           /* bit buffer */
-  Byte *window;         /* sliding window */
-  Byte *end;            /* one byte after sliding window */
-  Byte *read;           /* window read pointer */
-  Byte *write;          /* window write pointer */
+  Bytef *window;        /* sliding window */
+  Bytef *end;           /* one byte after sliding window */
+  Bytef *read;          /* window read pointer */
+  Bytef *write;         /* window write pointer */
  check_func checkfn;   /* check function */
  uLong check;          /* check on output */

 };

+
 /* defines for inflate input/output */
 /*   update pointers and return */
 #define UPDBITS {s->bitb=b;s->bitk=k;}
@@ -69,7 +70,7 @@ struct inflate_blocks_state {
 #define NEEDBITS(j) {while(k<(j)){NEEDBYTE;b|=((uLong)NEXTBYTE)<<k;k+=8;}}
 #define DUMPBITS(j) {b>>=(j);k-=(j);}
 /*   output bytes */
-#define WAVAIL (q<s->read?s->read-q-1:s->end-q)
+#define WAVAIL (uInt)(q<s->read?s->read-q-1:s->end-q)
 #define LOADOUT {q=s->write;m=WAVAIL;}
 #define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=WAVAIL;}}
 #define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT}
@@ -82,8 +83,8 @@ struct inflate_blocks_state {
 extern uInt inflate_mask[];

 /* copy as much as possible from the sliding window to the output area */
-extern int inflate_flush __P((
-    struct inflate_blocks_state *,
+extern int inflate_flush OF((
+    inflate_blocks_statef *,
    z_stream *,
    int));

--- a/minigzip.c
+++ b/minigzip.c
@@ -18,14 +18,13 @@
 #include <stdio.h>
 #include "zlib.h"

-#ifndef __GO32__
-extern void exit  __P((int));
-#endif
-extern int unlink __P((const char *));
-
 #ifdef STDC
 #  include <string.h>
+#  include <stdlib.h>
+#else
+   extern void exit  OF((int));
 #endif
+extern int unlink OF((const char *));

 #if defined(MSDOS) || defined(OS2) || defined(WIN32)
 #  include <fcntl.h>
@@ -35,6 +34,13 @@ extern int unlink __P((const char *));
 #  define SET_BINARY_MODE(file)
 #endif

+#ifdef VMS
+#  define GZ_SUFFIX "-gz"
+#else
+#  define GZ_SUFFIX ".gz"
+#endif
+#define SUFFIX_LEN sizeof(GZ_SUFFIX)
+
 #define BUFLEN 4096
 #define MAX_NAME_LEN 1024

@@ -46,12 +52,12 @@ extern int unlink __P((const char *));

 char *prog;

-void error           __P((char *msg));
-void gz_compress     __P((FILE   *in, gzFile out));
-void gz_uncompress   __P((gzFile in, FILE   *out));
-void file_compress   __P((char  *file));
-void file_uncompress __P((char  *file));
-void main            __P((int argc, char *argv[]));
+void error           OF((char *msg));
+void gz_compress     OF((FILE   *in, gzFile out));
+void gz_uncompress   OF((gzFile in, FILE   *out));
+void file_compress   OF((char  *file));
+void file_uncompress OF((char  *file));
+int  main            OF((int argc, char *argv[]));

 /* ===========================================================================
 * Display error message and exit
@@ -124,14 +130,14 @@ void file_compress(file)
    gzFile out;

    strcpy(outfile, file);
-    strcat(outfile, ".gz");
+    strcat(outfile, GZ_SUFFIX);

    in = fopen(file, "rb");
    if (in == NULL) {
        perror(file);
        exit(1);
    }
-    out = gzopen(outfile, "wb");
+    out = gzopen(outfile, "wb"); /* use "wb9" for maximal compression */
    if (out == NULL) {
        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
        exit(1);
@@ -156,14 +162,14 @@ void file_uncompress(file)

    strcpy(buf, file);

-    if (len > 3 && strcmp(file+len-3, ".gz") == 0) {
+    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
        infile = file;
        outfile = buf;
        outfile[len-3] = '\0';
    } else {
        outfile = file;
        infile = buf;
-        strcat(infile, ".gz");
+        strcat(infile, GZ_SUFFIX);
    }
    in = gzopen(infile, "rb");
    if (in == NULL) {
@@ -186,7 +192,7 @@ void file_uncompress(file)
 * Usage:  minigzip [-d] [files...]
 */

-void main(argc, argv)
+int main(argc, argv)
    int argc;
    char *argv[];
 {
@@ -210,7 +216,7 @@ void main(argc, argv)
            if (file == NULL) error("can't gzdopen stdin");
            gz_uncompress(file, stdout);
        } else {
-            file = gzdopen(fileno(stdout), "wb");
+            file = gzdopen(fileno(stdout), "wb"); /* "wb9" for max compr. */
            if (file == NULL) error("can't gzdopen stdout");
            gz_compress(stdin, file);
        }
@@ -224,4 +230,5 @@ void main(argc, argv)
        } while (argv++, --argc);
    }
    exit(0);
+    return 0; /* to avoid warning */
 }
--- a/trees.c
+++ b/trees.c
@@ -78,13 +78,12 @@ local uch bl_order[BL_CODES]

 /* ===========================================================================
 * Local data. These are initialized only once.
- * To do: initialize at compile time to be completely reentrant. ???
 */

 local ct_data static_ltree[L_CODES+2];
 /* The static literal tree. Since the bit lengths are imposed, there is no
 * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see ct_init
+ * The codes 286 and 287 are needed to build a canonical tree (see tr_init
 * below).
 */

@@ -110,7 +109,7 @@ local int base_dist[D_CODES];

 struct static_tree_desc_s {
    ct_data *static_tree;        /* static tree or NULL */
-    int     *extra_bits;         /* extra bits for each code or NULL */
+    intf    *extra_bits;         /* extra bits for each code or NULL */
    int     extra_base;          /* base index for extra_bits */
    int     elems;               /* max number of elements in the tree */
    int     max_length;          /* max bit length for the codes */
@@ -129,24 +128,24 @@ local static_tree_desc  static_bl_desc =
 * Local (static) routines in this file.
 */

-local void ct_static_init __P((void));
-local void init_block     __P((deflate_state *s));
-local void pqdownheap     __P((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     __P((deflate_state *s, tree_desc *desc));
-local void gen_codes      __P((ct_data *tree, int max_code, ush bl_count[]));
-local void build_tree     __P((deflate_state *s, tree_desc *desc));
-local void scan_tree      __P((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      __P((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  __P((deflate_state *s));
-local void send_all_trees __P((deflate_state *s, int lcodes, int dcodes,
+local void tr_static_init OF((void));
+local void init_block     OF((deflate_state *s));
+local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
+local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
+local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
+local void build_tree     OF((deflate_state *s, tree_desc *desc));
+local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local int  build_bl_tree  OF((deflate_state *s));
+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
                              int blcodes));
-local void compress_block __P((deflate_state *s, ct_data *ltree,
+local void compress_block OF((deflate_state *s, ct_data *ltree,
                              ct_data *dtree));
-local void set_data_type  __P((deflate_state *s));
-local void send_bits      __P((deflate_state *s, int value, int length));
-local unsigned bi_reverse __P((unsigned value, int length));
-local void bi_windup      __P((deflate_state *s));
-local void copy_block     __P((deflate_state *s, char *buf, unsigned len,
+local void set_data_type  OF((deflate_state *s));
+local unsigned bi_reverse OF((unsigned value, int length));
+local void bi_windup      OF((deflate_state *s));
+local void bi_flush       OF((deflate_state *s));
+local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
                              int header));

 #ifndef DEBUG
@@ -166,15 +165,74 @@ local void copy_block     __P((deflate_state *s, char *buf, unsigned len,
 * used.
 */

+/* ===========================================================================
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
+ */
+#define put_short(s, w) { \
+    put_byte(s, (uch)((w) & 0xff)); \
+    put_byte(s, (uch)((ush)(w) >> 8)); \
+}
+
+/* ===========================================================================
+ * Send a value on a given number of bits.
+ * IN assertion: length <= 16 and value fits in length bits.
+ */
+#ifdef DEBUG
+local void send_bits      OF((deflate_state *s, int value, int length));
+
+local void send_bits(s, value, length)
+    deflate_state *s;
+    int value;  /* value to send */
+    int length; /* number of bits */
+{
+    Tracevv((stderr," l %2d v %4x ", length, value));
+    Assert(length > 0 && length <= 15, "invalid length");
+    s->bits_sent += (ulg)length;
+
+    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * unused bits in value.
+     */
+    if (s->bi_valid > (int)Buf_size - length) {
+        s->bi_buf |= (value << s->bi_valid);
+        put_short(s, s->bi_buf);
+        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
+        s->bi_valid += length - Buf_size;
+    } else {
+        s->bi_buf |= value << s->bi_valid;
+        s->bi_valid += length;
+    }
+}
+#else /* !DEBUG */
+
+#define send_bits(s, value, length) \
+{ int len = length;\
+  if (s->bi_valid > (int)Buf_size - len) {\
+    int val = value;\
+    s->bi_buf |= (val << s->bi_valid);\
+    put_short(s, s->bi_buf);\
+    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
+    s->bi_valid += len - Buf_size;\
+  } else {\
+    s->bi_buf |= (value) << s->bi_valid;\
+    s->bi_valid += len;\
+  }\
+}
+#endif /* DEBUG */
+
+
 #define MAX(a,b) (a >= b ? a : b)
 /* the arguments must not have side effects */

 /* ===========================================================================
- * Initialize the various 'constant' tables.
- * To do: do this at compile time.
+ * Initialize the various 'constant' tables. In a multi-threaded environment,
+ * this function may be called by two threads concurrently, but this is
+ * harmless since both invocations do exactly the same thing.
 */
-local void ct_static_init()
+local void tr_static_init()
 {
+    static static_init_done = 0;
    int n;        /* iterates over tree elements */
    int bits;     /* bit counter */
    int length;   /* length value */
@@ -183,6 +241,8 @@ local void ct_static_init()
    ush bl_count[MAX_BITS+1];
    /* number of codes at each bit length for an optimal tree */

+    if (static_init_done) return;
+
    /* Initialize the mapping length (0..255) -> length code (0..28) */
    length = 0;
    for (code = 0; code < LENGTH_CODES-1; code++) {
@@ -191,7 +251,7 @@ local void ct_static_init()
            length_code[length++] = (uch)code;
        }
    }
-    Assert (length == 256, "ct_static_init: length != 256");
+    Assert (length == 256, "tr_static_init: length != 256");
    /* Note that the length 255 (match length 258) can be represented
     * in two different ways: code 284 + 5 bits or code 285, so we
     * overwrite length_code[255] to use the best encoding:
@@ -206,7 +266,7 @@ local void ct_static_init()
            dist_code[dist++] = (uch)code;
        }
    }
-    Assert (dist == 256, "ct_static_init: dist != 256");
+    Assert (dist == 256, "tr_static_init: dist != 256");
    dist >>= 7; /* from now on, all distances are divided by 128 */
    for ( ; code < D_CODES; code++) {
        base_dist[code] = dist << 7;
@@ -214,7 +274,7 @@ local void ct_static_init()
            dist_code[256 + dist++] = (uch)code;
        }
    }
-    Assert (dist == 256, "ct_static_init: 256+dist != 512");
+    Assert (dist == 256, "tr_static_init: 256+dist != 512");

    /* Construct the codes of the static literal tree */
    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
@@ -234,17 +294,16 @@ local void ct_static_init()
        static_dtree[n].Len = 5;
        static_dtree[n].Code = bi_reverse(n, 5);
    }
+    static_init_done = 1;
 }

 /* ===========================================================================
 * Initialize the tree data structures for a new zlib stream.
 */
-void ct_init(s)
+void tr_init(s)
    deflate_state *s;
 {
-    if (static_dtree[0].Len == 0) {
-        ct_static_init();              /* To do: at compile time */
-    }
+    tr_static_init();

    s->compressed_len = 0L;

@@ -259,6 +318,7 @@ void ct_init(s)

    s->bi_buf = 0;
    s->bi_valid = 0;
+    s->last_eob_len = 8; /* enough lookahead for inflate */
 #ifdef DEBUG
    s->bits_sent = 0L;
 #endif
@@ -356,7 +416,7 @@ local void gen_bitlen(s, desc)
    ct_data *tree  = desc->dyn_tree;
    int max_code   = desc->max_code;
    ct_data *stree = desc->stat_desc->static_tree;
-    int *extra     = desc->stat_desc->extra_bits;
+    intf *extra    = desc->stat_desc->extra_bits;
    int base       = desc->stat_desc->extra_base;
    int max_length = desc->stat_desc->max_length;
    int h;              /* heap index */
@@ -439,7 +499,7 @@ local void gen_bitlen(s, desc)
 local void gen_codes (tree, max_code, bl_count)
    ct_data *tree;             /* the tree to decorate */
    int max_code;              /* largest code with non zero frequency */
-    ush bl_count[];            /* number of codes at each bit length */
+    ushf *bl_count;            /* number of codes at each bit length */
 {
    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
    ush code = 0;              /* running code value */
@@ -465,7 +525,7 @@ local void gen_codes (tree, max_code, bl_count)
        /* Now reverse the bits */
        tree[n].Code = bi_reverse(next_code[len]++, len);

-        Tracec(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
    }
 }
@@ -487,8 +547,7 @@ local void build_tree(s, desc)
    int elems       = desc->stat_desc->elems;
    int n, m;          /* iterate over heap elements */
    int max_code = -1; /* largest code with non zero frequency */
-    int node = elems;  /* next internal node of the tree */
-    int new;           /* new node being created */
+    int node;          /* new node being created */

    /* Construct the initial heap, with least frequent element in
     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
@@ -511,11 +570,11 @@ local void build_tree(s, desc)
     * two codes of non zero frequency.
     */
    while (s->heap_len < 2) {
-        new = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-        tree[new].Freq = 1;
-        s->depth[new] = 0;
-        s->opt_len--; if (stree) s->static_len -= stree[new].Len;
-        /* new is 0 or 1 so it does not have extra bits */
+        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
+        tree[node].Freq = 1;
+        s->depth[node] = 0;
+        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
+        /* node is 0 or 1 so it does not have extra bits */
    }
    desc->max_code = max_code;

@@ -527,6 +586,7 @@ local void build_tree(s, desc)
    /* Construct the Huffman tree by repeatedly combining the least two
     * frequent nodes.
     */
+    node = elems;              /* next internal node of the tree */
    do {
        pqremove(s, tree, n);  /* n = node of least frequency */
        m = s->heap[SMALLEST]; /* m = node of next least frequency */
@@ -725,9 +785,9 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
 /* ===========================================================================
 * Send a stored block
 */
-void ct_stored_block(s, buf, stored_len, eof)
+void tr_stored_block(s, buf, stored_len, eof)
    deflate_state *s;
-    char *buf;        /* input block */
+    charf *buf;       /* input block */
    ulg stored_len;   /* length of input block */
    int eof;          /* true if this is the last block for a file */
 {
@@ -739,14 +799,35 @@ void ct_stored_block(s, buf, stored_len, eof)
 }

 /* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate
+ * Send one empty static block to give enough lookahead for inflate.
+ * This takes 10 bits, of which 7 may remain in the bit buffer.
+ * The current inflate code requires 9 bits of lookahead. If the
+ * last two codes for the previous block (real code plus EOB) were coded
+ * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
+ * the last real code. In this case we send two empty static blocks instead
+ * of one. (There are no problems if the previous block is stored or fixed.)
+ * To simplify the code, we assume the worst case of last real code encoded
+ * on one bit only.
 */
-void ct_align(s)
+void tr_align(s)
    deflate_state *s;
 {
    send_bits(s, STATIC_TREES<<1, 3);
    send_code(s, END_BLOCK, static_ltree);
    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
+    bi_flush(s);
+    /* Of the 10 bits for the empty block, we have already sent
+     * (10 - bi_valid) bits. The lookahead for the last real code (before
+     * the EOB of the previous block) was thus at least one plus the length
+     * of the EOB plus what we have just sent of the empty static block.
+     */
+    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
+        send_bits(s, STATIC_TREES<<1, 3);
+        send_code(s, END_BLOCK, static_ltree);
+        s->compressed_len += 10L;
+        bi_flush(s);
+    }
+    s->last_eob_len = 7;
 }

 /* ===========================================================================
@@ -754,15 +835,18 @@ void ct_align(s)
 * trees or store, and output the encoded block to the zip file. This function
 * returns the total compressed length for the file so far.
 */
-ulg ct_flush_block(s, buf, stored_len, eof)
+ulg tr_flush_block(s, buf, stored_len, eof)
    deflate_state *s;
-    char *buf;        /* input block, or NULL if too old */
+    charf *buf;       /* input block, or NULL if too old */
    ulg stored_len;   /* length of input block */
    int eof;          /* true if this is the last block for a file */
 {
    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
    int max_blindex;  /* index of last bit length code of non zero freq */

+    /* Build the Huffman trees unless a stored block is forced */
+    if (s->level > 0) {
+
 	 /* Check if the file is ascii or binary */
 	if (s->data_type == UNKNOWN) set_data_type(s);

@@ -783,7 +867,7 @@ ulg ct_flush_block(s, buf, stored_len, eof)
 	 */
 	max_blindex = build_bl_tree(s);

-    /* Determine the best encoding. Compute first the block length in bytes */
+	/* Determine the best encoding. Compute first the block length in bytes*/
 	opt_lenb = (s->opt_len+3+7)>>3;
 	static_lenb = (s->static_len+3+7)>>3;

@@ -793,18 +877,23 @@ ulg ct_flush_block(s, buf, stored_len, eof)

 	if (static_lenb <= opt_lenb) opt_lenb = static_lenb;

+    } else {
+        Assert(buf != (char*)0, "lost buf");
+	opt_lenb = stored_len + 5; /* force a stored block */
+    }
+
    /* If compression failed and this is the first and last block,
     * and if the .zip file can be seeked (to rewrite the local header),
     * the whole file is transformed into a stored file:
     */
 #ifdef STORED_FILE_OK
 #  ifdef FORCE_STORED_FILE
-    if (eof && compressed_len == 0L) { /* force stored file */
+    if (eof && s->compressed_len == 0L) { /* force stored file */
 #  else
    if (stored_len <= opt_lenb && eof && s->compressed_len==0L && seekable()) {
 #  endif
        /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */
-        if (buf == (char*)0) error ("block vanished");
+        if (buf == (charf*)0) error ("block vanished");

        copy_block(buf, (unsigned)stored_len, 0); /* without header */
        s->compressed_len = stored_len << 3;
@@ -824,7 +913,7 @@ ulg ct_flush_block(s, buf, stored_len, eof)
         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
         * transform a block into a stored block.
         */
-        ct_stored_block(s, buf, stored_len, eof);
+        tr_stored_block(s, buf, stored_len, eof);

 #ifdef FORCE_STATIC
    } else if (static_lenb >= 0) { /* force static trees */
@@ -858,7 +947,7 @@ ulg ct_flush_block(s, buf, stored_len, eof)
 * Save the match info and tally the frequency counts. Return true if
 * the current block must be flushed.
 */
-int ct_tally (s, dist, lc)
+int tr_tally (s, dist, lc)
    deflate_state *s;
    int dist;  /* distance of matched string */
    int lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
@@ -874,7 +963,7 @@ int ct_tally (s, dist, lc)
        dist--;             /* dist = match distance - 1 */
        Assert((ush)dist < (ush)MAX_DIST(s) &&
               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-               (ush)d_code(dist) < (ush)D_CODES,  "ct_tally: bad match");
+               (ush)d_code(dist) < (ush)D_CODES,  "tr_tally: bad match");

        s->dyn_ltree[length_code[lc]+LITERALS+1].Freq++;
        s->dyn_dtree[d_code(dist)].Freq++;
@@ -884,7 +973,7 @@ int ct_tally (s, dist, lc)
    if (s->level > 2 && (s->last_lit & 0xfff) == 0) {
        /* Compute an upper bound for the compressed length */
        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)s->strstart - s->block_start;
+        ulg in_length = (ulg)((long)s->strstart - s->block_start);
        int dcode;
        for (dcode = 0; dcode < D_CODES; dcode++) {
            out_length += (ulg)s->dyn_dtree[dcode].Freq *
@@ -950,6 +1039,7 @@ local void compress_block(s, ltree, dtree)
    } while (lx < s->last_lit);

    send_code(s, END_BLOCK, ltree);
+    s->last_eob_len = ltree[END_BLOCK].Len;
 }

 /* ===========================================================================
@@ -970,44 +1060,6 @@ local void set_data_type(s)
    s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? BINARY : ASCII);
 }

-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
-#ifdef DEBUG
-    Tracev((stderr," l %2d v %4x ", length, value));
-    Assert(length > 0 && length <= 15, "invalid length");
-    s->bits_sent += (ulg)length;
-#endif
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-     * unused bits in value.
-     */
-    if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (value << s->bi_valid);
-        put_short(s, s->bi_buf);
-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
-        s->bi_valid += length - Buf_size;
-    } else {
-        s->bi_buf |= value << s->bi_valid;
-        s->bi_valid += length;
-    }
-}
-
 /* ===========================================================================
 * Reverse the first len bits of a code, using straightforward code (a faster
 * method would use a table)
@@ -1026,7 +1078,24 @@ local unsigned bi_reverse(code, len)
 }

 /* ===========================================================================
- * Write out any remaining bits in an incomplete byte.
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(s)
+    deflate_state *s;
+{
+    if (s->bi_valid == 16) {
+        put_short(s, s->bi_buf);
+        s->bi_buf = 0;
+        s->bi_valid = 0;
+    } else if (s->bi_valid >= 8) {
+        put_byte(s, (Byte)s->bi_buf);
+        s->bi_buf >>= 8;
+        s->bi_valid -= 8;
+    }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
 */
 local void bi_windup(s)
    deflate_state *s;
@@ -1049,11 +1118,12 @@ local void bi_windup(s)
 */
 local void copy_block(s, buf, len, header)
    deflate_state *s;
-    char     *buf;    /* the input data */
+    charf    *buf;    /* the input data */
    unsigned len;     /* its length */
    int      header;  /* true if block header must be written */
 {
    bi_windup(s);        /* align on byte boundary */
+    s->last_eob_len = 8; /* enough lookahead for inflate */

    if (header) {
        put_short(s, (ush)len);   
--- a/uncompr.c
+++ b/uncompr.c
@@ -23,9 +23,9 @@
   buffer, or Z_DATA_ERROR if the input data was corrupted.
 */
 int uncompress (dest, destLen, source, sourceLen)
-    Byte *dest;
-    uLong *destLen;
-    Byte *source;
+    Bytef *dest;
+    uLongf *destLen;
+    Bytef *source;
    uLong sourceLen;
 {
    z_stream stream;
--- a/zconf.h
+++ b/zconf.h
@@ -15,29 +15,42 @@
  for some forms of corrupted input.
 */

-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#if defined(_GNUC__) && !defined(__32BIT__)
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#  define WIN32
+#endif
+#if (defined(__GNUC__) || defined(WIN32)) && !defined(__32BIT__)
 #  define __32BIT__
 #endif
 #if defined(__MSDOS__) && !defined(MSDOS)
 #  define MSDOS
 #endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
 #if defined(MSDOS) && !defined(__32BIT__)
 #  define MAXSEG_64K
 #endif
-#ifndef STDC
-#  if defined(MSDOS) || defined(__STDC__) || defined(__cplusplus)
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
+#  define STDC
+#endif
+#if (defined(__STDC__) || defined(__cplusplus)) && !defined(STDC)
 #  define STDC
-#  endif
 #endif

 #if !defined(STDC) && !defined(const)
 #  define const
 #endif

+#ifdef	__MWERKS__ /* Metrowerks CodeWarrior declares fileno() in unix.h */
+#  include <unix.h>
+#endif
+
 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL
 #  ifdef MAXSEG_64K
@@ -67,30 +80,50 @@

                        /* Type declarations */

-#ifndef __P /* function prototypes */
+#ifndef OF /* function prototypes */
 #  ifdef STDC
-#    define __P(args)  args
+#    define OF(args)  args
 #  else
-#    define __P(args)  ()
+#    define OF(args)  ()
 #  endif
 #endif

-#ifndef Byte
-  typedef unsigned char  Byte;  /* 8 bits */
-#endif
-#ifndef uInt
-  typedef unsigned int   uInt;  /* 16 bits or more */
-#endif
-#ifndef uLong
-  typedef unsigned long  uLong; /* 32 bits or more */
-#endif
-#ifndef voidp
-#  ifdef STDC
-     typedef void *voidp;
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#if defined(M_I86SM) || defined(M_I86MM) /* MSC small or medium model */
+#  ifdef _MSC_VER
+#    define FAR __far
 #  else
-     typedef Byte *voidp;
+#    define FAR far
 #  endif
 #endif
+#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
+#    define FAR _far /* completely untested, just a best guess */
+#endif
+#ifndef FAR
+#   define FAR
+#endif
+
+typedef unsigned char  Byte;  /* 8 bits */
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+typedef Byte FAR Bytef;
+typedef char FAR charf;
+typedef int FAR intf;
+typedef uInt FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void FAR *voidpf;
+   typedef void     *voidp;
+#else
+   typedef Byte FAR *voidpf;
+   typedef Byte     *voidp;
+#endif

 #endif /* _ZCONF_H */
-
--- a/zlib.h
+++ b/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 0.93 June 25th, 1995.
+  version 1.0, Jan 14th, 1996.

-  Copyright (C) 1995 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-1996 Jean-loup Gailly and Mark Adler

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@@ -26,9 +26,13 @@
 #ifndef _ZLIB_H
 #define _ZLIB_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "zconf.h"

-#define ZLIB_VERSION "0.93"
+#define ZLIB_VERSION "1.0"

 /* 
     The 'zlib' compression library provides in-memory compression and
@@ -49,26 +53,26 @@
  (providing more output space) before each call.
 */

-typedef voidp (*alloc_func) __P((voidp opaque, uInt items, uInt size));
-typedef void  (*free_func)  __P((voidp opaque, voidp address));
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));

 struct internal_state;

 typedef struct z_stream_s {
-    Byte     *next_in;  /* next input byte */
+    Bytef    *next_in;  /* next input byte */
    uInt     avail_in;  /* number of bytes available at next_in */
    uLong    total_in;  /* total nb of input bytes read so far */

-    Byte     *next_out; /* next output byte should be put there */
+    Bytef    *next_out; /* next output byte should be put there */
    uInt     avail_out; /* remaining free space at next_out */
    uLong    total_out; /* total nb of bytes output so far */

    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state *state; /* not visible by applications */
+    struct internal_state FAR *state; /* not visible by applications */

    alloc_func zalloc;  /* used to allocate the internal state */
    free_func  zfree;   /* used to free the internal state */
-    voidp      opaque;  /* private data object passed to zalloc and zfree */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */

    Byte     data_type; /* best guess about the data type: ascii or binary */

@@ -107,10 +111,10 @@ typedef struct z_stream_s {

 #define Z_NO_FLUSH      0
 #define Z_PARTIAL_FLUSH 1
-#define Z_FULL_FLUSH    2
-#define Z_SYNC_FLUSH    3 /* experimental: partial_flush + byte align */
+#define Z_SYNC_FLUSH    2
+#define Z_FULL_FLUSH    3
 #define Z_FINISH        4
-/* See deflate() below for the usage of these constants */
+/* Allowed flush values; see deflate() below for details */

 #define Z_OK            0
 #define Z_STREAM_END    1
@@ -121,6 +125,7 @@ typedef struct z_stream_s {
 #define Z_BUF_ERROR    (-5)
 /* error codes for the compression/decompression functions */

+#define Z_NO_COMPRESSION         0
 #define Z_BEST_SPEED             1
 #define Z_BEST_COMPRESSION       9
 #define Z_DEFAULT_COMPRESSION  (-1)
@@ -135,6 +140,9 @@ typedef struct z_stream_s {
 #define Z_UNKNOWN  2
 /* Used to set the data_type field */

+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
+
 #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */

 extern char *zlib_version;
@@ -145,17 +153,18 @@ extern char *zlib_version;

                        /* basic functions */

-extern int deflateInit __P((z_stream *strm, int level));
+extern int deflateInit OF((z_stream *strm, int level));
 /* 
     Initializes the internal stream state for compression. The fields
   zalloc, zfree and opaque must be initialized before by the caller.
   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
   use default allocation functions.

-     The compression level must be Z_DEFAULT_COMPRESSION, or between 1 and 9:
-   1 gives best speed, 9 gives best compression. Z_DEFAULT_COMPRESSION requests
-   a default compromise between speed and compression (currently equivalent
-   to level 6).
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+   1 gives best speed, 9 gives best compression, 0 gives no compression at
+   all (the input data is simply copied a block at a time).
+   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+   compression (currently equivalent to level 6).

     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
   enough memory, Z_STREAM_ERROR if level is not a valid compression level.
@@ -164,7 +173,7 @@ extern int deflateInit __P((z_stream *strm, int level));
 */


-extern int deflate __P((z_stream *strm, int flush));
+extern int deflate OF((z_stream *strm, int flush));
 /*
  Performs one or both of the following actions:

@@ -190,12 +199,20 @@ extern int deflate __P((z_stream *strm, int flush));
  block is terminated and flushed to the output buffer so that the
  decompressor can get all input data available so far. For method 9, a future
  variant on method 8, the current block will be flushed but not terminated.
+  Z_SYNC_FLUSH has the same effect as partial flush except that the compressed
+  output is byte aligned (the compressor can clear its internal bit buffer)
+  and the current block is always terminated; this can be useful if the
+  compressor has to be restarted from scratch after an interruption (in which
+  case the internal state of the compressor may be lost).
    If flush is set to Z_FULL_FLUSH, the compression block is terminated, a
  special marker is output and the compression dictionary is discarded; this
  is useful to allow the decompressor to synchronize if one compressed block
  has been damaged (see inflateSync below).  Flushing degrades compression and
  so should be used only when necessary.  Using Z_FULL_FLUSH too often can
-  seriously degrade the compression.
+  seriously degrade the compression. If deflate returns with avail_out == 0,
+  this function must be called again with the same value of the flush
+  parameter and more output space (updated avail_out), until the flush is
+  complete (deflate returns with non-zero avail_out).

    If the parameter flush is set to Z_FINISH, all pending input is processed,
  all pending output is flushed and deflate returns with Z_STREAM_END if there
@@ -223,7 +240,7 @@ extern int deflate __P((z_stream *strm, int flush));
 */


-extern int deflateEnd __P((z_stream *strm));
+extern int deflateEnd OF((z_stream *strm));
 /*
     All dynamically allocated data structures for this stream are freed.
   This function discards any unprocessed input and does not flush any
@@ -235,12 +252,12 @@ extern int deflateEnd __P((z_stream *strm));
 */


-extern int inflateInit __P((z_stream *strm));
+extern int inflateInit OF((z_stream *strm));
 /* 
     Initializes the internal stream state for decompression. The fields
-   zalloc and zfree must be initialized before by the caller.  If zalloc and
-   zfree are set to Z_NULL, deflateInit updates them to use default allocation
-   functions.
+   zalloc, zfree and opaque must be initialized before by the caller.  If
+   zalloc and zfree are set to Z_NULL, inflateInit updates them to use default
+   allocation functions.

     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
   enough memory.  msg is set to null if there is no error message.
@@ -249,7 +266,7 @@ extern int inflateInit __P((z_stream *strm));
 */


-extern int inflate __P((z_stream *strm, int flush));
+extern int inflate OF((z_stream *strm, int flush));
 /*
  Performs one or both of the following actions:

@@ -260,7 +277,7 @@ extern int inflate __P((z_stream *strm, int flush));

  - Provide more output starting at next_out and update next_out and avail_out
    accordingly.  inflate() always provides as much output as possible
-    (until no more input data or no more space in the output buffer).
+    (until there is no more input data or no more space in the output buffer).

  Before the call of inflate(), the application should ensure that at least
  one of the actions is possible, by providing more input and/or consuming
@@ -282,7 +299,9 @@ extern int inflate __P((z_stream *strm, int flush));
  output is flushed; avail_out must be large enough to hold all the
  uncompressed data. (The size of the uncompressed data may have been saved
  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state.
+  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+  is never required, but can be used to inform inflate that a faster routine
+  may be used for the single inflate() call.

    inflate() returns Z_OK if some progress has been made (more input
  processed or more output produced), Z_STREAM_END if the end of the
@@ -296,7 +315,7 @@ extern int inflate __P((z_stream *strm, int flush));
 */


-extern int inflateEnd __P((z_stream *strm));
+extern int inflateEnd OF((z_stream *strm));
 /*
     All dynamically allocated data structures for this stream are freed.
   This function discards any unprocessed input and does not flush any
@@ -313,7 +332,7 @@ extern int inflateEnd __P((z_stream *strm));
    The following functions are needed only in some special applications.
 */

-extern int deflateInit2 __P((z_stream *strm,
+extern int deflateInit2 OF((z_stream *strm,
                            int  level,
                            int  method,
                            int  windowBits,
@@ -321,10 +340,11 @@ extern int deflateInit2 __P((z_stream *strm,
                            int  strategy));
 /*   
     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc and zfree must be initialized before by the caller.
+   fields next_in, zalloc, zfree and opaque must be initialized before by
+   the caller.

-     The method parameter is the compression method. It must be 8 in this
-   version of the library. (Method 9 will allow a 64K history buffer and
+     The method parameter is the compression method. It must be Z_DEFLATED in
+   this version of the library. (Method 9 will allow a 64K history buffer and
   partial block flushes.)

     The windowBits parameter is the base two logarithm of the window size
@@ -368,7 +388,7 @@ extern int deflateInit2 __P((z_stream *strm,
   deflate().
 */
                            
-extern int deflateCopy __P((z_stream *dest,
+extern int deflateCopy OF((z_stream *dest,
                           z_stream *source));
 /*
     Sets the destination stream as a complete copy of the source stream.  If
@@ -391,7 +411,7 @@ extern int deflateCopy __P((z_stream *dest,
   destination.
 */

-extern int deflateReset __P((z_stream *strm));
+extern int deflateReset OF((z_stream *strm));
 /*
     This function is equivalent to deflateEnd followed by deflateInit,
   but does not free and reallocate all the internal compression state.
@@ -402,11 +422,25 @@ extern int deflateReset __P((z_stream *strm));
   stream state was inconsistent (such as zalloc or state being NULL).
 */

-extern int inflateInit2 __P((z_stream *strm,
+extern int deflateParams OF((z_stream *strm, int level, int strategy));
+/*
+     Dynamically update the compression level and compression strategy.
+   This can be used to switch between compression and straight copy of
+   the input data, or to switch to a different kind of input data requiring
+   a different strategy. If the compression level is changed, the input
+   available so far is compressed with the old level (and may be flushed);
+   the new level will take effect only at the next call of deflate().
+
+     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+   stream state was inconsistent or if a parameter was invalid.
+*/
+
+extern int inflateInit2 OF((z_stream *strm,
                            int  windowBits));
 /*   
     This is another version of inflateInit with more compression options. The
-   fields next_out, zalloc and zfree must be initialized before by the caller.
+   fields next_out, zalloc, zfree and opaque must be initialized before by
+   the caller.

     The windowBits parameter is the base two logarithm of the maximum window
   size (the size of the history buffer).  It should be in the range 8..15 for
@@ -431,11 +465,11 @@ extern int inflateInit2 __P((z_stream *strm,
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was
   not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as
   windowBits < 8). msg is set to null if there is no error message.
-   inflateInit2 does not perform any compression: this will be done by
+   inflateInit2 does not perform any decompression: this will be done by
   inflate().
 */

-extern int inflateSync __P((z_stream *strm));
+extern int inflateSync OF((z_stream *strm));
 /* 
    Skips invalid compressed data until the special marker (see deflate()
  above) can be found, or until all available input is skipped. No output
@@ -450,7 +484,7 @@ extern int inflateSync __P((z_stream *strm));
  until success or end of the input data.
 */

-extern int inflateReset __P((z_stream *strm));
+extern int inflateReset OF((z_stream *strm));
 /*
     This function is equivalent to inflateEnd followed by inflateInit,
   but does not free and reallocate all the internal decompression state.
@@ -471,8 +505,8 @@ extern int inflateReset __P((z_stream *strm));
   utility functions can easily be modified if you need special options.
 */

-extern int compress __P((Byte *dest,   uLong *destLen,
-                         Byte *source, uLong sourceLen));
+extern int compress OF((Bytef *dest,   uLongf *destLen,
+                        Bytef *source, uLong sourceLen));
 /*
     Compresses the source buffer into the destination buffer.  sourceLen is
   the byte length of the source buffer. Upon entry, destLen is the total
@@ -486,8 +520,8 @@ extern int compress __P((Byte *dest,   uLong *destLen,
   buffer.
 */

-extern int uncompress __P((Byte *dest,   uLong *destLen,
-                           Byte *source, uLong sourceLen));
+extern int uncompress OF((Bytef *dest,   uLongf *destLen,
+                          Bytef *source, uLong sourceLen));
 /*
     Decompresses the source buffer into the destination buffer.  sourceLen is
   the byte length of the source buffer. Upon entry, destLen is the total
@@ -507,28 +541,29 @@ extern int uncompress __P((Byte *dest,   uLong *destLen,

 typedef voidp gzFile;

-extern gzFile gzopen  __P((char *path, char *mode));
+extern gzFile gzopen  OF((char *path, char *mode));
 /*
     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb"). gzopen can also be used to read a file
-   which is not in gzip format; in this case gzread will directly read from
-   the file without decompression.
+   is as in fopen ("rb" or "wb") but can also include a compression level
+   ("wb9").  gzopen can be used to read a file which is not in gzip format;
+   in this case gzread will directly read from the file without decompression.
     gzopen returns NULL if the file could not be opened or if there was
   insufficient memory to allocate the (de)compression state; errno
   can be checked to distinguish the two cases (if errno is zero, the
   zlib error is Z_MEM_ERROR).
 */

-extern gzFile gzdopen  __P((int fd, char *mode));
+extern gzFile gzdopen  OF((int fd, char *mode));
 /*
     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, or pipe.
+   descriptors are obtained from calls like open, dup, creat, pipe or
+   fileno (in the file has been previously opened with fopen).
   The mode parameter is as in fopen ("rb" or "wb").
     gzdopen returns NULL if there was insufficient memory to allocate
   the (de)compression state.
 */

-extern int    gzread  __P((gzFile file, voidp buf, unsigned len));
+extern int    gzread  OF((gzFile file, voidp buf, unsigned len));
 /*
     Reads the given number of uncompressed bytes from the compressed file.
   If the input file was not in gzip format, gzread copies the given number
@@ -536,14 +571,14 @@ extern int    gzread  __P((gzFile file, voidp buf, unsigned len));
     gzread returns the number of uncompressed bytes actually read (0 for
   end of file, -1 for error). */

-extern int    gzwrite __P((gzFile file, voidp buf, unsigned len));
+extern int    gzwrite OF((gzFile file, voidp buf, unsigned len));
 /*
     Writes the given number of uncompressed bytes into the compressed file.
   gzwrite returns the number of uncompressed bytes actually written
   (0 in case of error).
 */

-extern int    gzflush __P((gzFile file, int flush));
+extern int    gzflush OF((gzFile file, int flush));
 /*
     Flushes all pending output into the compressed file. The parameter
   flush is as in the deflate() function. The return value is the zlib
@@ -553,14 +588,14 @@ extern int    gzflush __P((gzFile file, int flush));
   degrade compression.
 */

-extern int    gzclose __P((gzFile file));
+extern int    gzclose OF((gzFile file));
 /*
     Flushes all pending output if necessary, closes the compressed file
   and deallocates all the (de)compression state. The return value is the zlib
   error number (see function gzerror below).
 */

-extern char*   gzerror __P((gzFile file, int *errnum));
+extern char*   gzerror OF((gzFile file, int *errnum));
 /*
     Returns the error message for the last error which occurred on the
   given compressed file. errnum is set to zlib error number. If an
@@ -577,7 +612,8 @@ extern char*   gzerror __P((gzFile file, int *errnum));
   compression library.
 */

-extern uLong adler32 __P((uLong adler, Byte *buf, uInt len));
+extern uLong adler32 OF((uLong adler, Bytef *buf, uInt len));
+
 /*
     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
   return the updated checksum. If buf is NULL, this function returns
@@ -593,7 +629,7 @@ extern uLong adler32 __P((uLong adler, Byte *buf, uInt len));
     if (adler != original_adler) error();
 */

-extern uLong crc32   __P((uLong crc, Byte *buf, uInt len));
+extern uLong crc32   OF((uLong crc, Bytef *buf, uInt len));
 /*
     Update a running crc with the bytes buf[0..len-1] and return the updated
   crc. If buf is NULL, this function returns the required initial value
@@ -613,4 +649,8 @@ extern uLong crc32   __P((uLong crc, Byte *buf, uInt len));
    struct internal_state {int dummy;}; /* hack for buggy compilers */
 #endif

+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ZLIB_H */
--- a/zutil.c
+++ b/zutil.c
@@ -9,8 +9,10 @@

 #include "zutil.h"

-#ifndef __GO32__
-extern void exit __P((int));
+struct internal_state      {int dummy;}; /* for buggy compilers */
+
+#ifndef STDC
+extern void exit OF((int));
 #endif

 char *zlib_version = ZLIB_VERSION;
@@ -36,8 +38,8 @@ void z_error (m)
 #ifndef HAVE_MEMCPY

 void zmemcpy(dest, source, len)
-    Byte* dest;
-    Byte* source;
+    Bytef* dest;
+    Bytef* source;
    uInt  len;
 {
    if (len == 0) return;
@@ -47,7 +49,7 @@ void zmemcpy(dest, source, len)
 }

 void zmemzero(dest, len)
-    Byte* dest;
+    Bytef* dest;
    uInt  len;
 {
    if (len == 0) return;
@@ -57,8 +59,11 @@ void zmemzero(dest, len)
 }
 #endif

-#if defined(__TURBOC__) && !defined(__SMALL__)
-
+#ifdef __TURBOC__
+#if !defined(__SMALL__) && !defined(__MEDIUM__) && !defined(__32BIT__)
+/* Small and medium model are for now limited to near allocation with
+ * reduced MAX_WBITS and MAX_MEM_LEVEL
+ */
 #  define MY_ZCALLOC

 /* Turbo C malloc() does not allow dynamic allocation of 64K bytes
@@ -73,8 +78,8 @@ void zmemzero(dest, len)
 local int next_ptr = 0;

 typedef struct ptr_table_s {
-    voidp org_ptr;
-    voidp new_ptr;
+    voidpf org_ptr;
+    voidpf new_ptr;
 } ptr_table;

 local ptr_table table[MAX_PTR];
@@ -85,13 +90,19 @@ local ptr_table table[MAX_PTR];
 * a protected system like OS/2. Use Microsoft C instead.
 */

-voidp zcalloc (voidp opaque, unsigned items, unsigned size)
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
-    voidp buf = opaque; /* just to make some compilers happy */
+    voidpf buf = opaque; /* just to make some compilers happy */
    ulg bsize = (ulg)items*size;

-    if (bsize < 65536L) {
+    /* If we allocate less than 65520 bytes, we assume that farmalloc
+     * will return a usable pointer which doesn't have to be normalized.
+     */
+    if (bsize < 65520L) {
        buf = farmalloc(bsize);
+#ifdef DEBUG
+        zmemzero(buf, (uInt)bsize);
+#endif
        if (*(ush*)&buf != 0) return buf;
    } else {
        buf = farmalloc(bsize + 16L);
@@ -103,10 +114,14 @@ voidp zcalloc (voidp opaque, unsigned items, unsigned size)
    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
    *(ush*)&buf = 0;
    table[next_ptr++].new_ptr = buf;
+#ifdef DEBUG
+    zmemzero(buf, (uInt)65535);
+    ((uch*)buf)[65535] = 0;
+#endif
    return buf;
 }

-void  zcfree (voidp opaque, voidp ptr)
+void  zcfree (voidpf opaque, voidpf ptr)
 {
    int n;
    if (*(ush*)&ptr != 0) { /* object < 64K */
@@ -127,9 +142,11 @@ void  zcfree (voidp opaque, voidp ptr)
    ptr = opaque; /* just to make some compilers happy */
    z_error("zcfree: ptr not found");
 }
+#endif
 #endif /* __TURBOC__ */

-#if defined(M_I86CM) || defined(M_I86LM) /* MSC compact or large model */
+
+#ifdef M_I86 /* Microsoft C */

 #  define MY_ZCALLOC

@@ -138,39 +155,39 @@ void  zcfree (voidp opaque, voidp ptr)
 #  define _hfree   hfree
 #endif

-voidp zcalloc (voidp opaque, unsigned items, unsigned size)
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
    if (opaque) opaque = 0; /* to make compiler happy */
    return _halloc((long)items, size);
 }

-void  zcfree (voidp opaque, voidp ptr)
+void  zcfree (voidpf opaque, voidpf ptr)
 {
    if (opaque) opaque = 0; /* to make compiler happy */
    _hfree(ptr);
 }

-#endif /* defined(M_I86CM) || defined(M_I86LM) */
+#endif /* MSC */


 #ifndef MY_ZCALLOC /* Any system without a special alloc function */

-#ifndef __GO32__
-extern voidp calloc __P((uInt items, uInt size));
-extern void  free   __P((voidp ptr));
+#ifndef STDC
+extern voidp  calloc OF((uInt items, uInt size));
+extern void   free   OF((voidpf ptr));
 #endif

-voidp zcalloc (opaque, items, size)
-    voidp opaque;
+voidpf zcalloc (opaque, items, size)
+    voidpf opaque;
    unsigned items;
    unsigned size;
 {
-    return calloc(items, size);
+    return (voidpf)calloc(items, size);
 }

 void  zcfree (opaque, ptr)
-    voidp opaque;
-    voidp ptr;
+    voidpf opaque;
+    voidpf ptr;
 {
    free(ptr);
 }
--- a/zutil.h
+++ b/zutil.h
@@ -15,11 +15,7 @@

 #include "zlib.h"

-/* #ifndef __GNUC__   disable inline for now */
-#  define inline
-/* #endif */
-
-#ifdef MSDOS
+#if defined(MSDOS) || defined(VMS) || defined(CRAY)
 #   include <stddef.h>
 #   include <errno.h>
 #else
@@ -27,6 +23,7 @@
 #endif
 #ifdef STDC
 #  include <string.h>
+#  include <stdlib.h>
 #endif

 #ifndef local
@@ -35,19 +32,21 @@
 /* compile with -Dlocal if your debugger can't find static symbols */

 typedef unsigned char  uch;
+typedef uch FAR uchf;
 typedef unsigned short ush;
+typedef ush FAR ushf;
 typedef unsigned long  ulg;

 extern char *z_errmsg[]; /* indexed by 1-zlib_error */

-#define ERR_RETURN(strm,err) return (strm->msg=z_errmsg[1-err], err)
+#define ERR_RETURN(strm,err) return (strm->msg = z_errmsg[1-(err)], (err))
 /* To be used only when the state is known to be valid */

        /* common constants */

-#define DEFLATED   8
-
-#define DEF_WBITS 15
+#ifndef DEF_WBITS
+#  define DEF_WBITS MAX_WBITS
+#endif
 /* default windowBits for decompression. MAX_WBITS is for compression only */

 #if MAX_MEM_LEVEL >= 8
@@ -72,7 +71,7 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #  define OS_CODE  0x00
 #  ifdef __TURBOC__
 #    include <alloc.h>
-#  else /* MSC */
+#  else /* MSC or DJGPP */
 #    include <malloc.h>
 #  endif
 #endif
@@ -81,7 +80,7 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #  define OS_CODE  0x06
 #endif

-#ifdef WIN32 /* Windows NT */
+#ifdef WIN32 /* Window 95 & Windows NT */
 #  define OS_CODE  0x0b
 #endif

@@ -124,24 +123,35 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
         /* functions */

 #ifdef HAVE_STRERROR
-   extern char *strerror __P((int));
+   extern char *strerror OF((int));
 #  define zstrerror(errnum) strerror(errnum)
 #else
 #  define zstrerror(errnum) ""
 #endif

-#if defined(pyr) && !defined(NO_MEMCPY)
+#if defined(pyr)
+#  define NO_MEMCPY
+#endif
+#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(_MSC_VER)
+ /* Use our own functions for small and medium model with MSC <= 5.0.
+  * You may have to use the same strategy for Borland C (untested).
+  */
 #  define NO_MEMCPY
 #endif
 #if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
 #  define HAVE_MEMCPY
 #endif
 #ifdef HAVE_MEMCPY
+#  if defined(M_I86SM) || defined(M_I86MM) /* MSC small or medium model */
+#    define zmemcpy _fmemcpy
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else
 #    define zmemcpy memcpy
 #    define zmemzero(dest, len) memset(dest, 0, len)
+#  endif
 #else
-   extern void zmemcpy  __P((Byte* dest, Byte* source, uInt len));
-   extern void zmemzero __P((Byte* dest, uInt len));
+   extern void zmemcpy  OF((Bytef* dest, Bytef* source, uInt len));
+   extern void zmemzero OF((Bytef* dest, uInt len));
 #endif

 /* Diagnostic functions */
@@ -166,16 +176,16 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #endif


-typedef uLong (*check_func) __P((uLong check, Byte *buf, uInt len));
+typedef uLong (*check_func) OF((uLong check, Bytef *buf, uInt len));

-extern void z_error    __P((char *m));
+extern void z_error    OF((char *m));

-voidp zcalloc __P((voidp opaque, unsigned items, unsigned size));
-void  zcfree  __P((voidp opaque, voidp ptr));
+voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
+void   zcfree  OF((voidpf opaque, voidpf ptr));

 #define ZALLOC(strm, items, size) \
           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidp)(addr))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}

 #endif /* _Z_UTIL_H */
Author	SHA1	Message	Date
Mark Adler	8a2acbffc8	zlib 1.0-pre	2011-09-09 23:13:27 -07:00
Mark Adler	56bcb184fa	zlib 0.99	2011-09-09 23:11:37 -07:00
Mark Adler	25e5325501	zlib 0.95	2011-09-09 23:10:21 -07:00
Mark Adler	23c69f1069	zlib 0.94	2011-09-09 23:09:18 -07:00