zlib 1.1.1

zlib 1.1.0
zlib 1.0.9
2011-09-09 23:20:07 -07:00 · 2011-09-09 23:19:55 -07:00 · 2011-09-09 23:19:21 -07:00 · 2011-09-09 23:18:57 -07:00 · 2011-09-09 23:17:33 -07:00 · 2011-09-09 23:17:17 -07:00
62 changed files with 6530 additions and 978 deletions
--- a/217
+++ b/217
@@ -1,7 +1,222 @@
 		ChangeLog file for zlib
-Changes in 1.0 (15 Jan 96)
+Changes in 1.1.1 (27 Feb 98)
 - fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)
 - remove block truncation heuristic which had very marginal effect for zlib
  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
  compression ratio on some files. This also allows inlining _tr_tally for
  matches in deflate_slow.
 - added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
 Changes in 1.1.0 (24 Feb 98)
 - do not return STREAM_END prematurely in inflate (John Bowler)
 - revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
 - compile with -DFASTEST to get compression code optimized for speed only
 - in minigzip, try mmap'ing the input file first (Miguel Albrecht)
 - increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
  on Sun but significant on HP)
 - add a pointer to experimental unzip library in README (Gilles Vollant)
 - initialize variable gcc in configure (Chris Herborth)
 Changes in 1.0.9 (17 Feb 1998)
 - added gzputs and gzgets functions
 - do not clear eof flag in gzseek (Mark Diekhans)
 - fix gzseek for files in transparent mode (Mark Diekhans)
 - do not assume that vsprintf returns the number of bytes written (Jens Krinke)
 - replace EXPORT with ZEXPORT to avoid conflict with other programs
 - added compress2 in zconf.h, zlib.def, zlib.dnt
 - new asm code from Gilles Vollant in contrib/asm386
 - simplify the inflate code (Mark):
 . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
 . ZALLOC the length list in inflate_trees_fixed() instead of using stack
 . ZALLOC the value area for huft_build() instead of using stack
 . Simplify Z_FINISH check in inflate()
 - Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
 - in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
 - in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
  the declaration of FAR (Gilles VOllant)
 - install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
 - read_buf buf parameter of type Bytef* instead of charf*
 - zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
 - do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
 - fix check for presence of directories in "make install" (Ian Willis)
 Changes in 1.0.8 (27 Jan 1998)
 - fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
 - fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
 - added compress2() to allow setting the compression level
 - include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
 - use constant arrays for the static trees in trees.c instead of computing
  them at run time (thanks to Ken Raeburn for this suggestion). To create
  trees.h, compile with GEN_TREES_H and run "make test".
 - check return code of example in "make test" and display result
 - pass minigzip command line options to file_compress
 - simplifying code of inflateSync to avoid gcc 2.8 bug
 - support CC="gcc -Wall" in configure -s (QingLong)
 - avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
 - fix test for shared library support to avoid compiler warnings
 - zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
 - check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
 - do not use fdopen for Metrowerks on Mac (Brad Pettit))
 - add checks for gzputc and gzputc in example.c
 - avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
 - use const for the CRC table (Ken Raeburn)
 - fixed "make uninstall" for shared libraries
 - use Tracev instead of Trace in infblock.c
 - in example.c use correct compressed length for test_sync
 - suppress +vnocompatwarnings in configure for HPUX (not always supported)
 Changes in 1.0.7 (20 Jan 1998)
 - fix gzseek which was broken in write mode
 - return error for gzseek to negative absolute position
 - fix configure for Linux (Chun-Chung Chen)
 - increase stack space for MSC (Tim Wegner)
 - get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
 - define EXPORTVA for gzprintf (Gilles Vollant)
 - added man page zlib.3 (Rick Rodgers)
 - for contrib/untgz, fix makedir() and improve Makefile
 - check gzseek in write mode in example.c
 - allocate extra buffer for seeks only if gzseek is actually called
 - avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
 - add inflateSyncPoint in zconf.h
 - fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
 Changes in 1.0.6 (19 Jan 1998)
 - add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
 - Fix a deflate bug occuring only with compression level 0 (thanks to
  Andy Buckler for finding this one).
 - In minigzip, pass transparently also the first byte for .Z files.
 - return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
 - check Z_FINISH in inflate (thanks to Marc Schluper)
 - Implement deflateCopy (thanks to Adam Costello)
 - make static libraries by default in configure, add --shared option.
 - move MSDOS or Windows specific files to directory msdos
 - suppress the notion of partial flush to simplify the interface
  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
 - suppress history buffer provided by application to simplify the interface
  (this feature was not implemented anyway in 1.0.4)
 - next_in and avail_in must be initialized before calling inflateInit or
  inflateInit2
 - add EXPORT in all exported functions (for Windows DLL)
 - added Makefile.nt (thanks to Stephen Williams)
 - added the unsupported "contrib" directory:
   contrib/asm386/ by Gilles Vollant <info@winimage.com>
 	386 asm code replacing longest_match().
   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
        A C++ I/O streams interface to the zlib gz* functions
   contrib/iostream2/  by Tyge L<>vset <Tyge.Lovset@cmr.no>
 	Another C++ I/O streams interface
   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
 	A very simple tar.gz file extractor using zlib
   contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
        How to use compress(), uncompress() and the gz* functions from VB.
 - pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
  level) in minigzip (thanks to Tom Lane)
 - use const for rommable constants in deflate
 - added test for gzseek and gztell in example.c
 - add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
 - add undocumented function zError to convert error code to string
  (for Tim Smithers)
 - Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
 - Use default memcpy for Symantec MSDOS compiler.
 - Add EXPORT keyword for check_func (needed for Windows DLL)
 - add current directory to LD_LIBRARY_PATH for "make test"
 - create also a link for libz.so.1
 - added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
 - use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
 - added -soname for Linux in configure (Chun-Chung Chen,
 - assign numbers to the exported functions in zlib.def (for Windows DLL)
 - add advice in zlib.h for best usage of deflateSetDictionary
 - work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
 - allow compilation with ANSI keywords only enabled for TurboC in large model
 - avoid "versionString"[0] (Borland bug)
 - add NEED_DUMMY_RETURN for Borland
 - use variable z_verbose for tracing in debug mode (Peter Deutsch).
 - allow compilation with CC
 - defined STDC for OS/2 (David Charlap)	
 - limit external names to 8 chars for MVS (Thomas Lund)
 - in minigzip.c, use static buffers only for 16-bit systems
 - fix suffix check for "minigzip -d foo.gz"
 - do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
 - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
 - added makelcc.bat for lcc-win32 (Tom St Denis)
 - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
 - Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
 - check for unistd.h in configure (for off_t)
 - remove useless check parameter in inflate_blocks_free
 - avoid useless assignment of s->check to itself in inflate_blocks_new
 - do not flush twice in gzclose (thanks to Ken Raeburn)
 - rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
 - use NO_ERRNO_H instead of enumeration of operating systems with errno.h
 - work around buggy fclose on pipes for HP/UX
 - support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
 - fix configure if CC is already equal to gcc
 Changes in 1.0.5 (3 Jan 98)
 - Fix inflate to terminate gracefully when fed corrupted or invalid data
 - Use const for rommable constants in inflate
 - Eliminate memory leaks on error conditions in inflate
 - Removed some vestigial code in inflate
 - Update web address in README
 Changes in 1.0.4 (24 Jul 96)
 - In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
  bit, so the decompressor could decompress all the correct data but went
  on to attempt decompressing extra garbage data. This affected minigzip too.
 - zlibVersion and gzerror return const char* (needed for DLL)
 - port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
 - use z_error only for DEBUG (avoid problem with DLLs)
 Changes in 1.0.3 (2 Jul 96)
 - use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
  small and medium models; this makes the library incompatible with previous
  versions for these models. (No effect in large model or on other systems.)
 - return OK instead of BUF_ERROR if previous deflate call returned with
  avail_out as zero but there is nothing to do
 - added memcmp for non STDC compilers
 - define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
 - define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
 - better check for 16-bit mode MSC (avoids problem with Symantec)
 Changes in 1.0.2 (23 May 96)
 - added Windows DLL support
 - added a function zlibVersion (for the DLL support)
 - fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
 - Bytef is define's instead of typedef'd only for Borland C
 - avoid reading uninitialized memory in example.c
 - mention in README that the zlib format is now RFC1950
 - updated Makefile.dj2
 - added algorithm.doc
 Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
 - fix array overlay in deflate.c which sometimes caused bad compressed data
 - fix inflate bug with empty stored block
 - fix MSDOS medium model which was broken in 0.99
 - fix deflateParams() which could generated bad compressed data.
 - Bytef is define'd instead of typedef'ed (work around Borland bug)
 - added an INDEX file
 - new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
 - speed up adler32 for modern machines without auto-increment
 - added -ansi for IRIX in configure
 - static_init_done in trees.c is an int
 - define unlink as delete for VMS
 - fix configure for QNX
 - add configure branch for SCO and HPUX
 - avoid many warnings (unused variables, dead assignments, etc...)
 - no fdopen for BeOS
 - fix the Watcom fix for 32 bit mode (define FAR as empty)
 - removed redefinition of Byte for MKWERKS
 - work around an MWKERKS bug (incorrect merge of all .h files)
 Changes in 0.99 (27 Jan 96)
 - allow preset dictionary shared between compressor and decompressor
 - allow compression level 0 (no compression)
 - add deflateParams in zlib.h: allow dynamic change of compression level
--- a/75
+++ b/75
@@ -0,0 +1,75 @@
 ChangeLog		history of changes
 INDEX			this file
 Make_vms.com		script for Vax/VMS
 Makefile		makefile for Unix (generated by configure)
 Makefile.in		makefile for Unix (template for configure)
 Makefile.msc		makefile for Microsoft C 16-bit
 Makefile.riscos 	makefile for RISCOS
 Makefile.sas		makefile for Amiga SAS/C
 README			guess what
 algorithm.txt		description of the (de)compression algorithm
 configure		configure script for Unix
 descrip.mms		makefile for Vax/VMS
 zlib.3			mini man page for zlib (volunteers to write full
 			man pages from zlib.h welcome. write to jloup@gzip.org)
 msdos/Makefile.w32      makefile for Microsoft Visual C++ 32-bit
 msdos/Makefile.b32	makefile for Borland C++   32-bit
 msdos/Makefile.bor	makefile for Borland C/C++ 16-bit
 msdos/Makefile.dj2	makefile for DJGPP 2.x
 msdos/Makefile.tc	makefile for Turbo C
 msdos/Makefile.wat	makefile for Watcom C
 msdos/zlib.def        	definition file for Windows DLL
 msdos/zlib.rc         	definition file for Windows DLL
 nt/Makefile.nt		makefile for Windows NT
 nt/zlib.dnt		definition file for Windows NT DLL
 		zlib public header files (must be kept):
 zconf.h
 zlib.h
 		private source files used to build the zlib library:
 adler32.c
 compress.c
 crc32.c
 deflate.c
 deflate.h
 gzio.c
 infblock.c
 infblock.h
 infcodes.c
 infcodes.h
 inffast.c
 inffast.h
 inflate.c
 inftrees.c
 inftrees.h
 infutil.c
 infutil.h
 trees.c
 uncompr.c
 zutil.c
 zutil.h
 		source files for sample programs:
 example.c
 minigzip.c
 		unsupported contribution by third parties
 contrib/asm386/ by Gilles Vollant <info@winimage.com>
 	386 asm code replacing longest_match().
 contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
        A C++ I/O streams interface to the zlib gz* functions
 contrib/iostream2/  by Tyge L<>vset <Tyge.Lovset@cmr.no>
 	Another C++ I/O streams interface
 contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
 	A very simple tar.gz extractor using zlib
 contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
        How to use compress(), uncompress() and the gz* functions from VB.
--- a/72
+++ b/72
@@ -1,10 +1,11 @@
 # Makefile for zlib
-# Copyright (C) 1995-1996 Jean-loup Gailly.
+# Copyright (C) 1995-1998 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in zlib.h 
 # To compile and test, type:
 #   ./configure; make test
 # The call of configure is optional if you don't have special requirements
 # If you wish to build zlib as a shared library, use: ./configure -s
 # To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
 #    make install
@@ -22,12 +23,14 @@ CFLAGS=-O
 LDFLAGS=-L. -lz
 LDSHARED=$(CC)
-VER=1.0
+VER=1.1.1
 LIBS=libz.a
 SHAREDLIB=libz.so
 AR=ar rc
 RANLIB=ranlib
 TAR=tar
 SHELL=/bin/sh
 prefix=/usr/local
 exec_prefix = $(prefix)
@@ -37,22 +40,35 @@ OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
 TEST_OBJS = example.o minigzip.o
-DISTFILES = README ChangeLog configure Makefile.in Makefile Makefile.msc \
+DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] *.[ch] descrip.mms \
-	    Makefile.bor Makefile.tc Make_vms.com descrip.mms *.[ch]
+  algorithm.txt zlib.3 msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \
  nt/Makefile.nt nt/zlib.dnt  contrib/README.contrib contrib/*.txt \
  contrib/asm386/*.asm contrib/asm386/*.c \
  contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/iostream/*.cpp \
  contrib/iostream/*.h  contrib/iostream2/*.h contrib/iostream2/*.cpp \
  contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32
 all: example minigzip
 test: all
-	./example
+	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
-	echo hello world | ./minigzip | ./minigzip -d 
+	echo hello world | ./minigzip | ./minigzip -d || \
 	  echo '		*** minigzip test FAILED ***' ; \
 	if ./example; then \
 	  echo '		*** zlib test OK ***'; \
 	else \
 	  echo '		*** zlib test FAILED ***'; \
 	fi
 libz.a: $(OBJS)
 	$(AR) $@ $(OBJS)
-	-@ ($(RANLIB) $@ || true) 2>/dev/null
+	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-libz.so.$(VER): $(OBJS)
+$(SHAREDLIB).$(VER): $(OBJS)
 	$(LDSHARED) -o $@ $(OBJS)
-	rm -f libz.so; ln -s $@ libz.so
+	rm -f $(SHAREDLIB) $(SHAREDLIB).1
 	ln -s $@ $(SHAREDLIB)
 	ln -s $@ $(SHAREDLIB).1
 example: example.o $(LIBS)
 	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
@@ -61,37 +77,49 @@ minigzip: minigzip.o $(LIBS)
 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 install: $(LIBS)
-	-@if [ ! $(prefix)/include  ]; then mkdir $(prefix)/include; fi
+	-@if [ ! -d $(prefix)/include  ]; then mkdir $(prefix)/include; fi
-	-@if [ ! $(exec_prefix)/lib ]; then mkdir $(exec_prefix)/lib; fi
+	-@if [ ! -d $(exec_prefix)/lib ]; then mkdir $(exec_prefix)/lib; fi
 	cp zlib.h zconf.h $(prefix)/include
 	chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
 	cp $(LIBS) $(exec_prefix)/lib
-	cd $(exec_prefix)/lib; chmod 644 $(LIBS)
+	cd $(exec_prefix)/lib; chmod 755 $(LIBS)
 	-@(cd $(exec_prefix)/lib; $(RANLIB) libz.a || true) >/dev/null 2>&1
-	cd $(exec_prefix)/lib; if test -f libz.so.$(VER); then \
+	cd $(exec_prefix)/lib; if test -f $(SHAREDLIB).$(VER); then \
-	  ln -s libz.so.$(VER) libz.so; \
+	  rm -f $(SHAREDLIB) $(SHAREDLIB).1; \
 	  ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB); \
 	  ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB).1; \
 	  (ldconfig || true)  >/dev/null 2>&1; \
 	fi
 # The ranlib in install is needed on NeXTSTEP which checks file times
 # ldconfig is for Linux
 uninstall:
-	cd $(exec_prefix)/lib; rm -f $(LIBS); \
+	cd $(prefix)/include; \
-	if test -f libz.so; then \
+	v=$(VER); \
-	 v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p'<$(prefix)/include/zlib.h`;\
+	if test -f zlib.h; then \
-	 rm -f libz.so.$$v libz.so; \
+	  v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \
          rm -f zlib.h zconf.h; \
 	fi; \
 	cd $(exec_prefix)/lib; rm -f libz.a; \
 	if test -f $(SHAREDLIB).$$v; then \
 	  rm -f $(SHAREDLIB).$$v $(SHAREDLIB) $(SHAREDLIB).1; \
 	fi
 	cd $(prefix)/include; rm -f zlib.h zconf.h
 clean:
 	rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
 distclean:	clean
 zip:
 	mv Makefile Makefile~; cp -p Makefile.in Makefile
-	v=`sed -n -e 's/\./-/' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+	rm -f test.c ztest*.c
-	zip -ul9 zlib-$$v $(DISTFILES)
+	v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
 	zip -ul9 zlib$$v $(DISTFILES)
 	mv Makefile~ Makefile
 dist:
 	mv Makefile Makefile~; cp -p Makefile.in Makefile
 	rm -f test.c ztest*.c
 	d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
 	rm -f $$d.tar.gz; \
 	if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
@@ -125,6 +153,6 @@ 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 infblock.h inftrees.h infcodes.h infutil.h
 minigzip.o:  zlib.h zconf.h 
-trees.o: deflate.h zutil.h zlib.h zconf.h 
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
 uncompr.o: zlib.h zconf.h
 zutil.o: zutil.h zlib.h zconf.h  
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,10 +1,11 @@
 # Makefile for zlib
-# Copyright (C) 1995-1996 Jean-loup Gailly.
+# Copyright (C) 1995-1998 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in zlib.h 
 # To compile and test, type:
 #   ./configure; make test
 # The call of configure is optional if you don't have special requirements
 # If you wish to build zlib as a shared library, use: ./configure -s
 # To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
 #    make install
@@ -22,12 +23,14 @@ CFLAGS=-O
 LDFLAGS=-L. -lz
 LDSHARED=$(CC)
-VER=1.0
+VER=1.1.1
 LIBS=libz.a
 SHAREDLIB=libz.so
 AR=ar rc
 RANLIB=ranlib
 TAR=tar
 SHELL=/bin/sh
 prefix=/usr/local
 exec_prefix = $(prefix)
@@ -37,22 +40,35 @@ OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
 TEST_OBJS = example.o minigzip.o
-DISTFILES = README ChangeLog configure Makefile.in Makefile Makefile.msc \
+DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] *.[ch] descrip.mms \
-	    Makefile.bor Makefile.tc Make_vms.com descrip.mms *.[ch]
+  algorithm.txt zlib.3 msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \
  nt/Makefile.nt nt/zlib.dnt  contrib/README.contrib contrib/*.txt \
  contrib/asm386/*.asm contrib/asm386/*.c \
  contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/iostream/*.cpp \
  contrib/iostream/*.h  contrib/iostream2/*.h contrib/iostream2/*.cpp \
  contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32
 all: example minigzip
 test: all
-	./example
+	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
-	echo hello world | ./minigzip | ./minigzip -d 
+	echo hello world | ./minigzip | ./minigzip -d || \
 	  echo '		*** minigzip test FAILED ***' ; \
 	if ./example; then \
 	  echo '		*** zlib test OK ***'; \
 	else \
 	  echo '		*** zlib test FAILED ***'; \
 	fi
 libz.a: $(OBJS)
 	$(AR) $@ $(OBJS)
-	-@ ($(RANLIB) $@ || true) 2>/dev/null
+	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-libz.so.$(VER): $(OBJS)
+$(SHAREDLIB).$(VER): $(OBJS)
 	$(LDSHARED) -o $@ $(OBJS)
-	rm -f libz.so; ln -s $@ libz.so
+	rm -f $(SHAREDLIB) $(SHAREDLIB).1
 	ln -s $@ $(SHAREDLIB)
 	ln -s $@ $(SHAREDLIB).1
 example: example.o $(LIBS)
 	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
@@ -61,37 +77,49 @@ minigzip: minigzip.o $(LIBS)
 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 install: $(LIBS)
-	-@if [ ! $(prefix)/include  ]; then mkdir $(prefix)/include; fi
+	-@if [ ! -d $(prefix)/include  ]; then mkdir $(prefix)/include; fi
-	-@if [ ! $(exec_prefix)/lib ]; then mkdir $(exec_prefix)/lib; fi
+	-@if [ ! -d $(exec_prefix)/lib ]; then mkdir $(exec_prefix)/lib; fi
 	cp zlib.h zconf.h $(prefix)/include
 	chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
 	cp $(LIBS) $(exec_prefix)/lib
-	cd $(exec_prefix)/lib; chmod 644 $(LIBS)
+	cd $(exec_prefix)/lib; chmod 755 $(LIBS)
 	-@(cd $(exec_prefix)/lib; $(RANLIB) libz.a || true) >/dev/null 2>&1
-	cd $(exec_prefix)/lib; if test -f libz.so.$(VER); then \
+	cd $(exec_prefix)/lib; if test -f $(SHAREDLIB).$(VER); then \
-	  ln -s libz.so.$(VER) libz.so; \
+	  rm -f $(SHAREDLIB) $(SHAREDLIB).1; \
 	  ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB); \
 	  ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB).1; \
 	  (ldconfig || true)  >/dev/null 2>&1; \
 	fi
 # The ranlib in install is needed on NeXTSTEP which checks file times
 # ldconfig is for Linux
 uninstall:
-	cd $(exec_prefix)/lib; rm -f $(LIBS); \
+	cd $(prefix)/include; \
-	if test -f libz.so; then \
+	v=$(VER); \
-	 v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p'<$(prefix)/include/zlib.h`;\
+	if test -f zlib.h; then \
-	 rm -f libz.so.$$v libz.so; \
+	  v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \
          rm -f zlib.h zconf.h; \
 	fi; \
 	cd $(exec_prefix)/lib; rm -f libz.a; \
 	if test -f $(SHAREDLIB).$$v; then \
 	  rm -f $(SHAREDLIB).$$v $(SHAREDLIB) $(SHAREDLIB).1; \
 	fi
 	cd $(prefix)/include; rm -f zlib.h zconf.h
 clean:
 	rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
 distclean:	clean
 zip:
 	mv Makefile Makefile~; cp -p Makefile.in Makefile
-	v=`sed -n -e 's/\./-/' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+	rm -f test.c ztest*.c
-	zip -ul9 zlib-$$v $(DISTFILES)
+	v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
 	zip -ul9 zlib$$v $(DISTFILES)
 	mv Makefile~ Makefile
 dist:
 	mv Makefile Makefile~; cp -p Makefile.in Makefile
 	rm -f test.c ztest*.c
 	d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
 	rm -f $$d.tar.gz; \
 	if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
@@ -125,6 +153,6 @@ 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 infblock.h inftrees.h infcodes.h infutil.h
 minigzip.o:  zlib.h zconf.h 
-trees.o: deflate.h zutil.h zlib.h zconf.h 
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
 uncompr.o: zlib.h zconf.h
 zutil.o: zutil.h zlib.h zconf.h  
--- a/Makefile.riscos
+++ b/Makefile.riscos
@@ -0,0 +1,46 @@
 # Project:   zlib_1_03
 # Toolflags:
 CCflags = -c -depend !Depend -IC: -g -throwback  -DRISCOS  -fnah 
 C++flags = -c -depend !Depend -IC: -throwback
 Linkflags = -aif -c++ -o $@ 
 ObjAsmflags = -throwback -NoCache -depend !Depend
 CMHGflags = 
 LibFileflags = -c -l -o $@ 
 Squeezeflags = -o $@
 # Final targets:
@.zlib_lib:   @.o.adler32 @.o.compress @.o.crc32 @.o.deflate @.o.gzio \
        @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil @.o.trees \
        @.o.uncompress @.o.zutil 
        LibFile $(LibFileflags) @.o.adler32 @.o.compress @.o.crc32 @.o.deflate \
        @.o.gzio @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil \
        @.o.trees @.o.uncompress @.o.zutil 
@.test:   @.tests.minigzip @.tests.example 
        echo Please run "Test" in directory tests 
@.tests.minigzip:   @.o.minigzip @.zlib_lib C:o.Stubs 
        Link $(Linkflags) @.o.minigzip @.zlib_lib C:o.Stubs 
@.tests.example:   @.o.example @.zlib_lib C:o.Stubs 
        Link $(Linkflags) @.o.example @.zlib_lib C:o.Stubs 
 # User-editable dependencies:
 .c.o:
        cc $(ccflags) -o $@ $<
 # Static dependencies:
@.o.example:   @.tests.c.example
        cc $(ccflags) -o @.o.example @.tests.c.example 
@.o.minigzip:   @.tests.c.minigzip
        cc $(ccflags) -o @.o.minigzip @.tests.c.minigzip 
 # Dynamic dependencies:
 o.minigzip:	tests.c.minigzip
 o.minigzip:	h.zlib
 o.minigzip:	h.zconf
 o.example:	tests.c.example
 o.example:	h.zlib
 o.example:	h.zconf
--- a/Makefile.sas
+++ b/Makefile.sas
@@ -0,0 +1,64 @@
 # SMakefile for zlib
 # Modified from the standard UNIX Makefile Copyright Jean-loup Gailly
 # Osma Ahvenlampi <Osma.Ahvenlampi@hut.fi>
 # Amiga, SAS/C 6.56 & Smake
 CC=sc
 CFLAGS=OPT
 #CFLAGS=OPT CPU=68030
 #CFLAGS=DEBUG=LINE
 LDFLAGS=LIB z.lib
 SCOPTIONS=OPTSCHED OPTINLINE OPTALIAS OPTTIME OPTINLOCAL STRMERGE \
       NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX 
 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: SCOPTIONS example minigzip
 test: all
 	`cd`/example
 	echo hello world | minigzip | minigzip -d 
 install: z.lib
 	copy zlib.h zconf.h INCLUDE: clone
 	copy z.lib LIB: clone
 z.lib: $(OBJS)
 	oml z.lib r $(OBJS)
 example: example.o z.lib
 	$(CC) $(CFLAGS) LINK TO $@ example.o $(LDFLAGS)
 minigzip: minigzip.o z.lib
 	$(CC) $(CFLAGS) LINK TO $@ minigzip.o $(LDFLAGS)
 clean:
 	-delete force quiet *.o example minigzip z.lib foo.gz *.lnk SCOPTIONS
 SCOPTIONS: Smakefile
        copy to $@ <from <
 $(SCOPTIONS)
 <
 # 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/117
+++ b/117
@@ -1,13 +1,16 @@
-zlib 1.0 is a general purpose data compression library.  All the code
+zlib 1.1.1 is a general purpose data compression library.  All the code
-is reentrant (thread safe).  The data format used by the zlib library
+is thread safe.  The data format used by the zlib library
-is described in the files zlib-3.3.doc, deflate-1.3.doc and
+is described by RFCs (Request for Comments) 1950 to 1952 in the files 
-gzip-4.3.doc, available in ftp://ftp.uu.net/pub/archiving/zip/doc/
+ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate
 format) and rfc1952.txt (gzip format). These documents are also available in
 other formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
-All functions of the compression library are documented in the file
+All functions of the compression library are documented in the file zlib.h
-zlib.h. A usage example of the library is given in the file example.c
+(volunteer to write man pages welcome, contact jloup@gzip.org). A usage
-which also tests that the library is working correctly. Another
+example of the library is given in the file example.c which also tests that
-example is given in the file minigzip.c. The compression library itself
+the library is working correctly. Another example is given in the file
-is composed of all source files except example.c and minigzip.c.
+minigzip.c. The compression library itself is composed of all source files
 except example.c and minigzip.c.
 To compile all files and run the test program, follow the instructions
 given at the top of Makefile. In short "make test; make install"
@@ -16,50 +19,74 @@ makefiles such as Makefile.msc; for VMS, use Make_vms.com or descrip.mms.
 Questions about zlib should be sent to <zlib@quest.jpl.nasa.gov> or,
 if this fails, to the addresses given below in the Copyright section.
 The zlib home page is http://www.cdrom.com/pub/infozip/zlib/
 The official zlib ftp site is ftp://ftp.cdrom.com/pub/infozip/zlib/
 Mark Nelson wrote an article about zlib for the Jan. 1997 issue of 
 Dr. Dobb's Journal; a copy of the article is available in
 http://web2.airmail.net/markn/articles/zlibtool/zlibtool.htm
-The changes made in version 1.0 are documented in the file ChangeLog.
+The changes made in version 1.1.1 are documented in the file ChangeLog.
-The main changes since 0.95 are:
+The main changes since 1.1.0 are:
 - allow preset dictionary shared between compressor and decompressor
 - 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
 - add optional "configure" to build zlib as a shared library
 - suppress Makefile.qnx, use configure instead
 - fixes for 64-bit systems (needed for Alpha and Cray)
 - declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
 - always return Z_BUF_ERROR when deflate() has nothing to do
 - deflateInit and inflateInit are now macros to allow version checking
 - prefix all global functions and types with z_ with -DZ_PREFIX
 - fix some very unlikely race conditions in multi-threaded environment
 - several minor fixes for better portability
 - free in reverse order of allocation to help memory manager
 - use zlib-1.0/* instead of zlib/* inside the tar.gz
 - make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
 - allow gzread on concatenated .gz files
 - deflateEnd now returns Z_DATA_ERROR if it was premature
 - deflate is finally (?) fully deterministic
-Notes for some targets:
+- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)
 - remove block truncation heuristic which had very marginal effect for zlib
  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
  compression ratio on some files. This also allows inlining _tr_tally for
  matches in deflate_slow.
 - For Turbo C the small model is supported only with reduced performance to
  avoid any far allocation; it was tested with -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
- For 64-bit Iris, deflate.c must be compiled without any optimization.
+Unsupported third party contributions are provided in directory "contrib".
  With -O, one libpng test fails. The test works in 32 bit mode (with the
  -32 compiler flag).
- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1   
+A Java implementation of zlib is available in the Java Development Kit 1.1
-  it works when compiled with cc.
+http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html
-
+See the zlib home page http://www.cdrom.com/pub/infozip/zlib/ for details.
 - zlib doesn't work on HP-UX 9.05 with one cc compiler (the one not
  accepting the -O option). It works with the other cc compiler.
 A Perl interface to zlib written by Paul Marquess <pmarquess@bfsec.bt.co.uk>
 is in the CPAN (Comprehensive Perl Archive Network) sites, such as:
 ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Compress/Compress-Zlib*
 A Python interface to zlib written by A.M. Kuchling <amk@magnet.com>
 is available from the Python Software Association sites, such as:
 ftp://ftp.python.org/pub/python/contrib/Encoding/zlib*.tar.gz
 An experimental package to read files in .zip format, written on top of
 zlib by Gilles Vollant <info@winimage.com>, is available at
 http://www.winimage.com/zLibDll/unzip.html
 Notes for some targets:
 - To build a Windows DLL version, include in a DLL project zlib.def, zlib.rc
  and all .c files except example.c and minigzip.c; compile with -DZLIB_DLL
  The zlib DLL support was initially done by Alessandro Iacopetti and is
  now maintained by Gilles Vollant <info@winimage.com>. Check the zlib DLL
  home page at http://www.winimage.com/zLibDll
  From Visual Basic, you can call the DLL functions which do not take
  a structure as argument: compress, uncompress and all gz* functions.
  See contrib/visual-basic.txt for more information.
  I don't know how to handle structures in Visual Basic, sorry.
 - For 64-bit Irix, deflate.c must be compiled without any optimization.
  With -O, one libpng test fails. The test works in 32 bit mode (with
  the -n32 compiler flag). The compiler bug has been reported to SGI.
 - zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1   
  it works when compiled with cc.
 - zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works
  with other compilers. Use "make test" to check your compiler.
 - For shared memory multiprocessors, the decompression code assumes that
  writes to pointers are atomic. Also the functions zalloc and zfree passed
  to deflateInit must be multi-threaded in this case.
 - gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
 - For Turbo C the small model is supported only with reduced performance to
  avoid any far allocation; it was tested with -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
 Acknowledgments:
  The deflate format used by zlib was defined by Phil Katz. The deflate
@@ -69,7 +96,7 @@ Acknowledgments:
 Copyright notice:
- (C) 1995-1996 Jean-loup Gailly and Mark Adler
+ (C) 1995-1998 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
@@ -88,7 +115,7 @@ Copyright notice:
  3. This notice may not be removed or altered from any source distribution.
  Jean-loup Gailly        Mark Adler
-  gzip@prep.ai.mit.edu    madler@alumni.caltech.edu
+  jloup@gzip.org          madler@alumni.caltech.edu
 If you use the zlib library in a product, we would appreciate *not*
 receiving lengthy legal documents to sign. The sources are provided
--- a/adler32.c
+++ b/adler32.c
@@ -1,9 +1,9 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
-/* $Id: adler32.c,v 1.6 1995/05/03 17:27:08 jloup Exp $ */
+/* @(#) $Id$ */
 #include "zlib.h"
@@ -11,14 +11,14 @@
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-#define DO1(buf)  {s1 += *buf++; s2 += s1;}
+#define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
-#define DO2(buf)  DO1(buf); DO1(buf);
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf)  DO2(buf); DO2(buf);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf)  DO4(buf); DO4(buf);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf) DO8(buf); DO8(buf);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
 /* ========================================================================= */
-uLong adler32(adler, buf, len)
+uLong ZEXPORT adler32(adler, buf, len)
    uLong adler;
    const Bytef *buf;
    uInt len;
@@ -34,10 +34,12 @@ uLong adler32(adler, buf, len)
        len -= k;
        while (k >= 16) {
            DO16(buf);
 	    buf += 16;
            k -= 16;
        }
        if (k != 0) do {
-            DO1(buf);
+            s1 += *buf++;
 	    s2 += s1;
        } while (--k);
        s1 %= BASE;
        s2 %= BASE;
--- a/algorithm.txt
+++ b/algorithm.txt
@@ -0,0 +1,213 @@
 1. Compression algorithm (deflate)
 The deflation algorithm used by gzip (also zip and zlib) is a variation of
 LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in
 the input data.  The second occurrence of a string is replaced by a
 pointer to the previous string, in the form of a pair (distance,
 length).  Distances are limited to 32K bytes, and lengths are limited
 to 258 bytes. When a string does not occur anywhere in the previous
 32K bytes, it is emitted as a sequence of literal bytes.  (In this
 description, `string' must be taken as an arbitrary sequence of bytes,
 and is not restricted to printable characters.)
 Literals or match lengths are compressed with one Huffman tree, and
 match distances are compressed with another tree. The trees are stored
 in a compact form at the start of each block. The blocks can have any
 size (except that the compressed data for one block must fit in
 available memory). A block is terminated when deflate() determines that
 it would be useful to start another block with fresh trees. (This is
 somewhat similar to the behavior of LZW-based _compress_.)
 Duplicated strings are found using a hash table. All input strings of
 length 3 are inserted in the hash table. A hash index is computed for
 the next 3 bytes. If the hash chain for this index is not empty, all
 strings in the chain are compared with the current input string, and
 the longest match is selected.
 The hash chains are searched starting with the most recent strings, to
 favor small distances and thus take advantage of the Huffman encoding.
 The hash chains are singly linked. There are no deletions from the
 hash chains, the algorithm simply discards matches that are too old.
 To avoid a worst-case situation, very long hash chains are arbitrarily
 truncated at a certain length, determined by a runtime option (level
 parameter of deflateInit). So deflate() does not always find the longest
 possible match but generally finds a match which is long enough.
 deflate() also defers the selection of matches with a lazy evaluation
 mechanism. After a match of length N has been found, deflate() searches for
 a longer match at the next input byte. If a longer match is found, the
 previous match is truncated to a length of one (thus producing a single
 literal byte) and the process of lazy evaluation begins again. Otherwise,
 the original match is kept, and the next match search is attempted only N
 steps later.
 The lazy match evaluation is also subject to a runtime parameter. If
 the current match is long enough, deflate() reduces the search for a longer
 match, thus speeding up the whole process. If compression ratio is more
 important than speed, deflate() attempts a complete second search even if
 the first match is already long enough.
 The lazy match evaluation is not performed for the fastest compression
 modes (level parameter 1 to 3). For these fast modes, new strings
 are inserted in the hash table only when no match was found, or
 when the match is not too long. This degrades the compression ratio
 but saves time since there are both fewer insertions and fewer searches.
 2. Decompression algorithm (inflate)
 2.1 Introduction
 The real question is, given a Huffman tree, how to decode fast.  The most
 important realization is that shorter codes are much more common than
 longer codes, so pay attention to decoding the short codes fast, and let
 the long codes take longer to decode.
 inflate() sets up a first level table that covers some number of bits of
 input less than the length of longest code.  It gets that many bits from the
 stream, and looks it up in the table.  The table will tell if the next
 code is that many bits or less and how many, and if it is, it will tell
 the value, else it will point to the next level table for which inflate()
 grabs more bits and tries to decode a longer code.
 How many bits to make the first lookup is a tradeoff between the time it
 takes to decode and the time it takes to build the table.  If building the
 table took no time (and if you had infinite memory), then there would only
 be a first level table to cover all the way to the longest code.  However,
 building the table ends up taking a lot longer for more bits since short
 codes are replicated many times in such a table.  What inflate() does is
 simply to make the number of bits in the first table a variable, and set it
 for the maximum speed.
 inflate() sends new trees relatively often, so it is possibly set for a
 smaller first level table than an application that has only one tree for
 all the data.  For inflate, which has 286 possible codes for the
 literal/length tree, the size of the first table is nine bits.  Also the
 distance trees have 30 possible values, and the size of the first table is
 six bits.  Note that for each of those cases, the table ended up one bit
 longer than the ``average'' code length, i.e. the code length of an
 approximately flat code which would be a little more than eight bits for
 286 symbols and a little less than five bits for 30 symbols.  It would be
 interesting to see if optimizing the first level table for other
 applications gave values within a bit or two of the flat code size.
 2.2 More details on the inflate table lookup
 Ok, you want to know what this cleverly obfuscated inflate tree actually  
 looks like.  You are correct that it's not a Huffman tree.  It is simply a  
 lookup table for the first, let's say, nine bits of a Huffman symbol.  The  
 symbol could be as short as one bit or as long as 15 bits.  If a particular  
 symbol is shorter than nine bits, then that symbol's translation is duplicated
 in all those entries that start with that symbol's bits.  For example, if the  
 symbol is four bits, then it's duplicated 32 times in a nine-bit table.  If a  
 symbol is nine bits long, it appears in the table once.
 If the symbol is longer than nine bits, then that entry in the table points  
 to another similar table for the remaining bits.  Again, there are duplicated  
 entries as needed.  The idea is that most of the time the symbol will be short
 and there will only be one table look up.  (That's whole idea behind data  
 compression in the first place.)  For the less frequent long symbols, there  
 will be two lookups.  If you had a compression method with really long  
 symbols, you could have as many levels of lookups as is efficient.  For  
 inflate, two is enough.
 So a table entry either points to another table (in which case nine bits in  
 the above example are gobbled), or it contains the translation for the symbol  
 and the number of bits to gobble.  Then you start again with the next  
 ungobbled bit.
 You may wonder: why not just have one lookup table for how ever many bits the  
 longest symbol is?  The reason is that if you do that, you end up spending  
 more time filling in duplicate symbol entries than you do actually decoding.   
 At least for deflate's output that generates new trees every several 10's of  
 kbytes.  You can imagine that filling in a 2^15 entry table for a 15-bit code  
 would take too long if you're only decoding several thousand symbols.  At the  
 other extreme, you could make a new table for every bit in the code.  In fact,
 that's essentially a Huffman tree.  But then you spend two much time  
 traversing the tree while decoding, even for short symbols.
 So the number of bits for the first lookup table is a trade of the time to  
 fill out the table vs. the time spent looking at the second level and above of
 the table.
 Here is an example, scaled down:
 The code being decoded, with 10 symbols, from 1 to 6 bits long:
 A: 0
 B: 10
 C: 1100
 D: 11010
 E: 11011
 F: 11100
 G: 11101
 H: 11110
 I: 111110
 J: 111111
 Let's make the first table three bits long (eight entries):
 000: A,1
 001: A,1
 010: A,1
 011: A,1
 100: B,2
 101: B,2
 110: -> table X (gobble 3 bits)
 111: -> table Y (gobble 3 bits)
 Each entry is what the bits decode to and how many bits that is, i.e. how  
 many bits to gobble.  Or the entry points to another table, with the number of
 bits to gobble implicit in the size of the table.
 Table X is two bits long since the longest code starting with 110 is five bits
 long:
 00: C,1
 01: C,1
 10: D,2
 11: E,2
 Table Y is three bits long since the longest code starting with 111 is six  
 bits long:
 000: F,2
 001: F,2
 010: G,2
 011: G,2
 100: H,2
 101: H,2
 110: I,3
 111: J,3
 So what we have here are three tables with a total of 20 entries that had to  
 be constructed.  That's compared to 64 entries for a single table.  Or  
 compared to 16 entries for a Huffman tree (six two entry tables and one four  
 entry table).  Assuming that the code ideally represents the probability of  
 the symbols, it takes on the average 1.25 lookups per symbol.  That's compared
 to one lookup for the single table, or 1.66 lookups per symbol for the  
 Huffman tree.
 There, I think that gives you a picture of what's going on.  For inflate, the  
 meaning of a particular symbol is often more than just a letter.  It can be a  
 byte (a "literal"), or it can be either a length or a distance which  
 indicates a base value and a number of bits to fetch after the code that is  
 added to the base value.  Or it might be the special end-of-block code.  The  
 data structures created in inftrees.c try to encode all that information  
 compactly in the tables.
 Jean-loup Gailly        Mark Adler
 jloup@gzip.org          madler@alumni.caltech.edu
 References:
 [LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data
 Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3,
 pp. 337-343.
 ``DEFLATE Compressed Data Format Specification'' available in
 ftp://ds.internic.net/rfc/rfc1951.txt
--- a/compress.c
+++ b/compress.c
@@ -1,38 +1,39 @@
 /* compress.c -- compress a memory buffer
- * Copyright (C) 1995-1996 Jean-loup Gailly.
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
-/* $Id: compress.c,v 1.6 1995/05/03 17:27:08 jloup Exp $ */
+/* @(#) $Id$ */
 #include "zlib.h"
 /* ===========================================================================
-     Compresses the source buffer into the destination buffer.  sourceLen is
+     Compresses the source buffer into the destination buffer. The level
-   the byte length of the source buffer. Upon entry, destLen is the total
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   size of the destination buffer, which must be at least 0.1% larger than
+   length of the source buffer. Upon entry, destLen is the total size of the
-   sourceLen plus 8 bytes. Upon exit, destLen is the actual size of the
+   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   compressed buffer.
+   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to compress a whole file at once if the
+
-   input file is mmap'ed.
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   Z_STREAM_ERROR if the level parameter is invalid.
   buffer.
 */
-int compress (dest, destLen, source, sourceLen)
+int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
    Bytef *dest;
    uLongf *destLen;
    const Bytef *source;
    uLong sourceLen;
    int level;
 {
    z_stream stream;
    int err;
    stream.next_in = (Bytef*)source;
    stream.avail_in = (uInt)sourceLen;
 #ifdef MAXSEG_64K
    /* Check for source > 64K on 16-bit machine: */
    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-
+#endif
    stream.next_out = dest;
    stream.avail_out = (uInt)*destLen;
    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
@@ -41,7 +42,7 @@ int compress (dest, destLen, source, sourceLen)
    stream.zfree = (free_func)0;
    stream.opaque = (voidpf)0;
-    err = deflateInit(&stream, Z_DEFAULT_COMPRESSION);
+    err = deflateInit(&stream, level);
    if (err != Z_OK) return err;
    err = deflate(&stream, Z_FINISH);
@@ -54,3 +55,14 @@ int compress (dest, destLen, source, sourceLen)
    err = deflateEnd(&stream);
    return err;
 }
 /* ===========================================================================
 */
 int ZEXPORT compress (dest, destLen, source, sourceLen)
    Bytef *dest;
    uLongf *destLen;
    const Bytef *source;
    uLong sourceLen;
 {
    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
 }
--- a/143
+++ b/143
@@ -4,28 +4,59 @@
 # of if you need special compiler, flags or install directory.
 # Otherwise, you can just use directly "make test; make install"
 #
 # To create a shared library, use "configure --shared"; by default a static
 # library is created. If the primitive shared library support provided here
 # does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz
 #
 # To impose specific compiler or flags or install directory, use for example:
 #    prefix=$HOME CC=cc CFLAGS="-O4" ./configure
 # or for csh/tcsh users:
 #    (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
 # LDSHARED is the command to be used to create a shared library
 # Incorrect settings of CC or CFLAGS may prevent creating a shared library.
 # If you have problems, try without defining CC and CFLAGS before reporting
 # an error.
 LIBS=libz.a
 SHAREDLIB=libz.so
 VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
 AR=${AR-"ar rc"}
 RANLIB=${RANLIB-"ranlib"}
 prefix=${prefix-/usr/local}
 exec_prefix=${exec_prefix-$prefix}
 shared_ext='.so'
 shared=0
 gcc=0
 old_cc="$CC"
 old_cflags="$CFLAGS"
 case "$1" in
  -s* | --s*) shared=1; shift;;
  -h* | --h*) echo 'syntax: configure [ --shared ]'; exit 0;;
 esac
 test -z "$CC" && echo Checking for gcc...
 test=ztest$$
 cat > $test.c <<EOF
-int hello() { printf("hello\n"); }
+extern int getchar();
 int hello() {return getchar();}
 EOF
-if test -z "$CC" && (gcc -c -O3 $test.c) 2>/dev/null; then
+
-  CC=gcc
+test -z "$CC" && echo Checking for gcc...
 cc=${CC-gcc}
 cflags=${CFLAGS-"-O3"}
 case "$cc" in
  *gcc*) gcc=1;;
 esac
 if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
  CC="$cc"
  SFLAGS=${CFLAGS-"-fPIC -O3"}
-  CFLAGS=${CFLAGS-"-O3"}
+  CFLAGS="$cflags"
-  LDSHARED=${LDSHARED-"gcc -shared"}
+  case `(uname -s || echo unknown) 2>/dev/null` in
  Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"};;
  *)             LDSHARED=${LDSHARED-"gcc -shared"};;
  esac
 else
  # find system name and corresponding cc options
  CC=${CC-cc}
@@ -36,46 +67,90 @@ else
  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
 	     CFLAGS=${CFLAGS-"-O2"}
 	     LDSHARED=${LDSHARED-"ld"};;
-  IRIX*)     SFLAGS=${CFLAGS-"-O2 -rpath ."}
+  IRIX*)     SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
-	     CFLAGS=${CFLAGS-"-O2"}
+	     CFLAGS=${CFLAGS-"-ansi -O2"}
 	     LDSHARED=${LDSHARED-"cc -shared"};;
-  QNX*)      SFLAGS=${CFLAGS-"-4 -O -Q"}
+  QNX*)      SFLAGS=${CFLAGS-"-4 -O"}
-             CFLAGS=${CFLAGS-"-4 -O -Q"}
+             CFLAGS=${CFLAGS-"-4 -O"}
 	     LDSHARED=${LDSHARED-"cc"}
-             LIBS=zlib.lib
+             RANLIB=${RANLIB-"true"}
             AR="cc -A";;
-  # send working options for other systems to gzip@prep.ai.mit.edu
+  SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
 	     CFLAGS=${CFLAGS-"-O3"}
 	     LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
  HP-UX*)    SFLAGS=${CFLAGS-"-O +z"}
 	     CFLAGS=${CFLAGS-"-O"}
 #	     LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
 	     LDSHARED=${LDSHARED-"ld -b"}
 	     shared_ext='.sl'
 	     SHAREDLIB='libz.sl';;
  UNIX_System_V\ 4.2.0) 
 	     SFLAGS=${CFLAGS-"-KPIC -O"}
 	     CFLAGS=${CFLAGS-"-O"}
 	     LDSHARED=${LDSHARED-"cc -G"};;
  # send working options for other systems to support@gzip.org
  *)         SFLAGS=${CFLAGS-"-O"}
 	     CFLAGS=${CFLAGS-"-O"}
-	     LDSHARED=${LDSHARED-"-shared"};;
+	     LDSHARED=${LDSHARED-"cc -shared"};;
  esac
 fi
-echo Checking for shared library support...
+if test $shared -eq 1; then
-# we must test in two steps (cc then ld), required at least on SunOS 4.x
+  echo Checking for shared library support...
-if test "`$CC -c $SFLAGS $test.c 2>&1`" = "" &&
+  # we must test in two steps (cc then ld), required at least on SunOS 4.x
-   test "`$LDSHARED -o $test.so $test.o 2>&1`" = ""; then
+  if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
-  CFLAGS="$SFLAGS"
+     test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
-  LIBS='libz.so.$(VER)'
+    CFLAGS="$SFLAGS"
-  echo Building shared library libz.so.$VER with $CC.
+    LIBS="$SHAREDLIB.$VER"
-else
+    echo Building shared library $SHAREDLIB.$VER with $CC.
  elif test -z "$old_cc" -a -z "$old_cflags"; then
    echo No shared library suppport.
    shared=0;
  else
    echo 'No shared library suppport; try without defining CC and CFLAGS'
    shared=0;
  fi
 fi
 if test $shared -eq 0; then
  LDSHARED="$CC"
  echo Building static library $LIBS version $VER with $CC.
 fi
-rm -f $test.[co] $test.so
+
 if test -f /usr/include/unistd.h; then
  CFLAGS="$CFLAGS -DHAVE_UNISTD_H"
 fi
 if test ! -f /usr/include/errno.h; then
  CFLAGS="$CFLAGS -DNO_ERRNO_H"
 fi
 cat > $test.c <<EOF
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 caddr_t hello() {
  return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0); 
 }
 EOF
 if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
  CFLAGS="$CFLAGS -DUSE_MMAP"
  echo Checking for mmap support... Yes.
 else
  echo Checking for mmap support... No.
 fi
 rm -f $test.[co] $test$shared_ext
 # udpate Makefile
 # ed -s Makefile <<EOF
 sed < Makefile.in "
-/^CC *=/s/=.*/=$CC/
+/^CC *=/s%=.*%=$CC%
-/^CFLAGS *=/s/=.*/=$CFLAGS/
+/^CFLAGS *=/s%=.*%=$CFLAGS%
-/^LDSHARED *=/s/=.*/=$LDSHARED/
+/^LDSHARED *=/s%=.*%=$LDSHARED%
-/^LIBS *=/s,=.*,=$LIBS,
+/^LIBS *=/s%=.*%=$LIBS%
-/^AR *=/s/=.*/=$AR/
+/^SHAREDLIB *=/s%=.*%=$SHAREDLIB%
-/^VER *=/s/=.*/=$VER/
+/^AR *=/s%=.*%=$AR%
-/^prefix *=/s,=.*,=$prefix,
+/^RANLIB *=/s%=.*%=$RANLIB%
-/^exec_prefix *=/s,=.*,=$exec_prefix,
+/^VER *=/s%=.*%=$VER%
 /^prefix *=/s%=.*%=$prefix%
 /^exec_prefix *=/s%=.*%=$exec_prefix%
 " > Makefile
 #w
 #q
 #EOF
--- a/contrib/README.contrib
+++ b/contrib/README.contrib
@@ -0,0 +1,20 @@
 All files under this contrib directory are UNSUPPORTED. There were
 provided by users of zlib and were not tested by the authors of zlib.
 Use at your own risk. Please contact the authors of the contributions
 for help about these, not the zlib authors. Thanks.
 asm386/     by Gilles Vollant <info@winimage.com>
 	386 asm code replacing longest_match(), for Visual C++ 4.2 and ML 6.11c
 iostream/   by Kevin Ruland <kevin@rodin.wustl.edu>
        A C++ I/O streams interface to the zlib gz* functions
 iostream2/  by Tyge L<>vset <Tyge.Lovset@cmr.no>
 	Another C++ I/O streams interface
 untgz/      by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
 	A very simple tar.gz file extractor using zlib
 visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
        How to use compress(), uncompress() and the gz* functions from VB.
--- a/contrib/asm386/gvmat32.asm
+++ b/contrib/asm386/gvmat32.asm
@@ -0,0 +1,559 @@
 ;
 ; gvmat32.asm -- Asm portion of the optimized longest_match for 32 bits x86
 ; Copyright (C) 1995-1996 Jean-loup Gailly and Gilles Vollant.
 ; File written by Gilles Vollant, by modifiying the longest_match
 ;  from Jean-loup Gailly in deflate.c
 ; It need wmask == 0x7fff
 ;     (assembly code is faster with a fixed wmask)
 ;
 ; For Visual C++ 4.2 and ML 6.11c (version in directory \MASM611C of Win95 DDK)
 ;   I compile with : "ml /coff /Zi /c gvmat32.asm"
 ;
 ;uInt longest_match_7fff(s, cur_match)
 ;    deflate_state *s;
 ;    IPos cur_match;                             /* current match */
        NbStack         equ     76
        cur_match       equ     dword ptr[esp+NbStack-0]
        str_s           equ     dword ptr[esp+NbStack-4]
 ; 5 dword on top (ret,ebp,esi,edi,ebx)
        adrret          equ     dword ptr[esp+NbStack-8]
        pushebp         equ     dword ptr[esp+NbStack-12]
        pushedi         equ     dword ptr[esp+NbStack-16]
        pushesi         equ     dword ptr[esp+NbStack-20]
        pushebx         equ     dword ptr[esp+NbStack-24]
        chain_length    equ     dword ptr [esp+NbStack-28]
        limit           equ     dword ptr [esp+NbStack-32]
        best_len        equ     dword ptr [esp+NbStack-36]
        window          equ     dword ptr [esp+NbStack-40]
        prev            equ     dword ptr [esp+NbStack-44]
        scan_start      equ      word ptr [esp+NbStack-48]
        wmask           equ     dword ptr [esp+NbStack-52]
        match_start_ptr equ     dword ptr [esp+NbStack-56]
        nice_match      equ     dword ptr [esp+NbStack-60]
        scan            equ     dword ptr [esp+NbStack-64]
        windowlen       equ     dword ptr [esp+NbStack-68]
        match_start     equ     dword ptr [esp+NbStack-72]
        strend          equ     dword ptr [esp+NbStack-76]
        NbStackAdd      equ     (NbStack-24)
    .386p
    name    gvmatch
    .MODEL  FLAT
 ;  all the +4 offsets are due to the addition of pending_buf_size (in zlib
 ;  in the deflate_state structure since the asm code was first written
 ;  (if you compile with zlib 1.0.4 or older, remove the +4).
 ;  Note : these value are good with a 8 bytes boundary pack structure
    dep_chain_length    equ     70h+4
    dep_window          equ     2ch+4
    dep_strstart        equ     60h+4
    dep_prev_length     equ     6ch+4
    dep_nice_match      equ     84h+4
    dep_w_size          equ     20h+4
    dep_prev            equ     34h+4
    dep_w_mask          equ     28h+4
    dep_good_match      equ     80h+4
    dep_match_start     equ     64h+4
    dep_lookahead       equ     68h+4
 _TEXT                   segment
 IFDEF NOUNDERLINE
                        public  longest_match_7fff
 ;                        public  match_init
 ELSE
                        public  _longest_match_7fff
 ;                        public  _match_init
 ENDIF
    MAX_MATCH           equ     258
    MIN_MATCH           equ     3
    MIN_LOOKAHEAD       equ     (MAX_MATCH+MIN_MATCH+1)
 IFDEF NOUNDERLINE
 ;match_init      proc near
 ;                ret
 ;match_init      endp
 ELSE
 ;_match_init     proc near
 ;                ret
 ;_match_init     endp
 ENDIF
 IFDEF NOUNDERLINE
 longest_match_7fff   proc near
 ELSE
 _longest_match_7fff  proc near
 ENDIF
        mov     edx,[esp+4]
        push    ebp
        push    edi
        push    esi
        push    ebx
        sub     esp,NbStackAdd
 ; initialize or check the variables used in match.asm.
        mov     ebp,edx
 ; chain_length = s->max_chain_length
 ; if (prev_length>=good_match) chain_length >>= 2
        mov     edx,[ebp+dep_chain_length]
        mov     ebx,[ebp+dep_prev_length]
        cmp     [ebp+dep_good_match],ebx
        ja      noshr
        shr     edx,2
 noshr:
 ; we increment chain_length because in the asm, the --chain_lenght is in the beginning of the loop
        inc     edx
        mov     edi,[ebp+dep_nice_match]
        mov     chain_length,edx
        mov     eax,[ebp+dep_lookahead]
        cmp     eax,edi
 ; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
        jae     nolookaheadnicematch
        mov     edi,eax
 nolookaheadnicematch:
 ; best_len = s->prev_length
        mov     best_len,ebx
 ; window = s->window
        mov     esi,[ebp+dep_window]
        mov     ecx,[ebp+dep_strstart]
        mov     window,esi
        mov     nice_match,edi
 ; scan = window + strstart
        add     esi,ecx
        mov     scan,esi
 ; dx = *window
        mov     dx,word ptr [esi]
 ; bx = *(window+best_len-1)
        mov     bx,word ptr [esi+ebx-1]
        add     esi,MAX_MATCH-1
 ; scan_start = *scan
        mov     scan_start,dx
 ; strend = scan + MAX_MATCH-1
        mov     strend,esi
 ; bx = scan_end = *(window+best_len-1)
 ;    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
 ;        s->strstart - (IPos)MAX_DIST(s) : NIL;
        mov     esi,[ebp+dep_w_size]
        sub     esi,MIN_LOOKAHEAD
 ; here esi = MAX_DIST(s)
        sub     ecx,esi
        ja      nodist
        xor     ecx,ecx
 nodist:
        mov     limit,ecx
 ; prev = s->prev
        mov     edx,[ebp+dep_prev]
        mov     prev,edx
 ;
        mov     edx,dword ptr [ebp+dep_match_start]
        mov     bp,scan_start
        mov     eax,cur_match
        mov     match_start,edx
        mov     edx,window
        mov     edi,edx
        add     edi,best_len
        mov     esi,prev
        dec     edi
 ; windowlen = window + best_len -1
        mov     windowlen,edi
        jmp     beginloop2
        align   4
 ; here, in the loop
 ;       eax = ax = cur_match
 ;       ecx = limit
 ;        bx = scan_end
 ;        bp = scan_start
 ;       edi = windowlen (window + best_len -1)
 ;       esi = prev
 ;// here; chain_length <=16
 normalbeg0add16:
        add     chain_length,16
        jz      exitloop
 normalbeg0:
        cmp     word ptr[edi+eax],bx
        je      normalbeg2noroll
 rcontlabnoroll:
 ; cur_match = prev[cur_match & wmask]
        and     eax,7fffh
        mov     ax,word ptr[esi+eax*2]
 ; if cur_match > limit, go to exitloop
        cmp     ecx,eax
        jnb     exitloop
 ; if --chain_length != 0, go to exitloop
        dec     chain_length
        jnz     normalbeg0
        jmp     exitloop
 normalbeg2noroll:
 ; if (scan_start==*(cur_match+window)) goto normalbeg2
        cmp     bp,word ptr[edx+eax]
        jne     rcontlabnoroll
        jmp     normalbeg2
 contloop3:
        mov     edi,windowlen
 ; cur_match = prev[cur_match & wmask]
        and     eax,7fffh
        mov     ax,word ptr[esi+eax*2]
 ; if cur_match > limit, go to exitloop
        cmp     ecx,eax
 jnbexitloopshort1:
        jnb     exitloop
 ; if --chain_length != 0, go to exitloop
 ; begin the main loop
 beginloop2:
        sub     chain_length,16+1
 ; if chain_length <=16, don't use the unrolled loop
        jna     normalbeg0add16
 do16:
        cmp     word ptr[edi+eax],bx
        je      normalbeg2dc0
 maccn   MACRO   lab
        and     eax,7fffh
        mov     ax,word ptr[esi+eax*2]
        cmp     ecx,eax
        jnb     exitloop
        cmp     word ptr[edi+eax],bx
        je      lab
        ENDM
 rcontloop0:
        maccn   normalbeg2dc1
 rcontloop1:
        maccn   normalbeg2dc2
 rcontloop2:
        maccn   normalbeg2dc3
 rcontloop3:
        maccn   normalbeg2dc4
 rcontloop4:
        maccn   normalbeg2dc5
 rcontloop5:
        maccn   normalbeg2dc6
 rcontloop6:
        maccn   normalbeg2dc7
 rcontloop7:
        maccn   normalbeg2dc8
 rcontloop8:
        maccn   normalbeg2dc9
 rcontloop9:
        maccn   normalbeg2dc10
 rcontloop10:
        maccn   short normalbeg2dc11
 rcontloop11:
        maccn   short normalbeg2dc12
 rcontloop12:
        maccn   short normalbeg2dc13
 rcontloop13:
        maccn   short normalbeg2dc14
 rcontloop14:
        maccn   short normalbeg2dc15
 rcontloop15:
        and     eax,7fffh
        mov     ax,word ptr[esi+eax*2]
        cmp     ecx,eax
        jnb     exitloop
        sub     chain_length,16
        ja      do16
        jmp     normalbeg0add16
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 normbeg MACRO   rcontlab,valsub
 ; if we are here, we know that *(match+best_len-1) == scan_end
        cmp     bp,word ptr[edx+eax]
 ; if (match != scan_start) goto rcontlab
        jne     rcontlab
 ; calculate the good chain_length, and we'll compare scan and match string
        add     chain_length,16-valsub
        jmp     iseq
        ENDM
 normalbeg2dc11:
        normbeg rcontloop11,11
 normalbeg2dc12:
        normbeg short rcontloop12,12
 normalbeg2dc13:
        normbeg short rcontloop13,13
 normalbeg2dc14:
        normbeg short rcontloop14,14
 normalbeg2dc15:
        normbeg short rcontloop15,15
 normalbeg2dc10:
        normbeg rcontloop10,10
 normalbeg2dc9:
        normbeg rcontloop9,9
 normalbeg2dc8:
        normbeg rcontloop8,8
 normalbeg2dc7:
        normbeg rcontloop7,7
 normalbeg2dc6:
        normbeg rcontloop6,6
 normalbeg2dc5:
        normbeg rcontloop5,5
 normalbeg2dc4:
        normbeg rcontloop4,4
 normalbeg2dc3:
        normbeg rcontloop3,3
 normalbeg2dc2:
        normbeg rcontloop2,2
 normalbeg2dc1:
        normbeg rcontloop1,1
 normalbeg2dc0:
        normbeg rcontloop0,0
 ; we go in normalbeg2 because *(ushf*)(match+best_len-1) == scan_end
 normalbeg2:
        mov     edi,window
        cmp     bp,word ptr[edi+eax]
        jne     contloop3                   ; if *(ushf*)match != scan_start, continue
 iseq:
 ; if we are here, we know that *(match+best_len-1) == scan_end
 ; and (match == scan_start)
        mov     edi,edx
        mov     esi,scan                    ; esi = scan
        add     edi,eax                     ; edi = window + cur_match = match
        mov     edx,[esi+3]                 ; compare manually dword at match+3
        xor     edx,[edi+3]                 ; and scan +3
        jz      begincompare                ; if equal, go to long compare
 ; we will determine the unmatch byte and calculate len (in esi)
        or      dl,dl
        je      eq1rr
        mov     esi,3
        jmp     trfinval
 eq1rr:
        or      dx,dx
        je      eq1
        mov     esi,4
        jmp     trfinval
 eq1:
        and     edx,0ffffffh
        jz      eq11
        mov     esi,5
        jmp     trfinval
 eq11:
        mov     esi,6
        jmp     trfinval
 begincompare:
        ; here we now scan and match begin same
        add     edi,6
        add     esi,6
        mov     ecx,(MAX_MATCH-(2+4))/4     ; scan for at most MAX_MATCH bytes
        repe    cmpsd                       ; loop until mismatch
        je      trfin                       ; go to trfin if not unmatch
 ; we determine the unmatch byte
        sub     esi,4
        mov     edx,[edi-4]
        xor     edx,[esi]
        or      dl,dl
        jnz     trfin
        inc     esi
        or      dx,dx
        jnz     trfin
        inc     esi
        and     edx,0ffffffh
        jnz     trfin
        inc     esi
 trfin:
        sub     esi,scan          ; esi = len
 trfinval:
 ; here we have finised compare, and esi contain len of equal string
        cmp     esi,best_len        ; if len > best_len, go newbestlen
        ja      short newbestlen
 ; now we restore edx, ecx and esi, for the big loop
        mov     esi,prev
        mov     ecx,limit
        mov     edx,window
        jmp     contloop3
 newbestlen:
        mov     best_len,esi        ; len become best_len
        mov     match_start,eax     ; save new position as match_start
        cmp     esi,nice_match      ; if best_len >= nice_match, exit
        jae     exitloop
        mov     ecx,scan
        mov     edx,window          ; restore edx=window
        add     ecx,esi
        add     esi,edx
        dec     esi
        mov     windowlen,esi       ; windowlen = window + best_len-1
        mov     bx,[ecx-1]          ; bx = *(scan+best_len-1) = scan_end
 ; now we restore ecx and esi, for the big loop :
        mov     esi,prev
        mov     ecx,limit
        jmp     contloop3
 exitloop:
 ; exit : s->match_start=match_start
        mov     ebx,match_start
        mov     ebp,str_s
        mov     ecx,best_len
        mov     dword ptr [ebp+dep_match_start],ebx        
        mov     eax,dword ptr [ebp+dep_lookahead]
        cmp     ecx,eax
        ja      minexlo
        mov     eax,ecx
 minexlo:
 ; return min(best_len,s->lookahead)
 ; restore stack and register ebx,esi,edi,ebp
        add     esp,NbStackAdd
        pop     ebx
        pop     esi
        pop     edi
        pop     ebp
        ret
 InfoAuthor:
 ; please don't remove this string !
 ; Your are free use gvmat32 in any fre or commercial apps if you don't remove the string in the binary!
        db     0dh,0ah,"GVMat32 optimised assembly code written 1996-98 by Gilles Vollant",0dh,0ah
 IFDEF NOUNDERLINE
 longest_match_7fff   endp
 ELSE
 _longest_match_7fff  endp
 ENDIF
 IFDEF NOUNDERLINE
 cpudetect32     proc near
 ELSE
 _cpudetect32    proc near
 ENDIF
 	pushfd                  ; push original EFLAGS
 	pop     eax             ; get original EFLAGS
 	mov     ecx, eax        ; save original EFLAGS
 	xor     eax, 40000h     ; flip AC bit in EFLAGS
 	push    eax             ; save new EFLAGS value on stack
 	popfd                   ; replace current EFLAGS value
 	pushfd                  ; get new EFLAGS
 	pop     eax             ; store new EFLAGS in EAX
 	xor     eax, ecx        ; can<61>t toggle AC bit, processor=80386
 	jz      end_cpu_is_386  ; jump if 80386 processor
 	push    ecx
 	popfd                   ; restore AC bit in EFLAGS first
 	pushfd
 	pushfd
 	pop     ecx
 	mov     eax, ecx        ; get original EFLAGS
 	xor     eax, 200000h    ; flip ID bit in EFLAGS
 	push    eax             ; save new EFLAGS value on stack
 	popfd                   ; replace current EFLAGS value
 	pushfd                  ; get new EFLAGS
 	pop		eax	            ; store new EFLAGS in EAX
 	popfd                   ; restore original EFLAGS
 	xor		eax, ecx        ; can<61>t toggle ID bit,
 	je		is_old_486		; processor=old
 	mov     eax,1
 	db      0fh,0a2h        ;CPUID   
 exitcpudetect:
 	ret
 end_cpu_is_386:
 	mov     eax,0300h
 	jmp     exitcpudetect
 is_old_486:
 	mov     eax,0400h
 	jmp     exitcpudetect
 IFDEF NOUNDERLINE
 cpudetect32     endp
 ELSE
 _cpudetect32    endp
 ENDIF
 _TEXT   ends
 end
--- a/contrib/asm386/gvmat32c.c
+++ b/contrib/asm386/gvmat32c.c
@@ -0,0 +1,200 @@
 /* gvmat32.c -- C portion of the optimized longest_match for 32 bits x86
 * Copyright (C) 1995-1996 Jean-loup Gailly and Gilles Vollant.
 * File written by Gilles Vollant, by modifiying the longest_match
 *  from Jean-loup Gailly in deflate.c
 *  it prepare all parameters and call the assembly longest_match_gvasm
 *  longest_match execute standard C code is wmask != 0x7fff
 *     (assembly code is faster with a fixed wmask)
 *
 */
 #include "deflate.h"
 #undef FAR
 #include <windows.h>
 #ifdef ASMV
 #define NIL 0
 #define UNALIGNED_OK
 /* if your C compiler don't add underline before function name,
 		define ADD_UNDERLINE_ASMFUNC */
 #ifdef ADD_UNDERLINE_ASMFUNC
 #define longest_match_7fff _longest_match_7fff
 #endif
 void match_init()
 {
 }
 unsigned long cpudetect32();
 uInt longest_match_c(
    deflate_state *s,
    IPos cur_match);                             /* current match */
 uInt longest_match_7fff(
    deflate_state *s,
    IPos cur_match);                             /* current match */
 uInt longest_match(
    deflate_state *s,
    IPos cur_match)                             /* current match */
 {
 	static uInt iIsPPro=2;
    if ((s->w_mask == 0x7fff) && (iIsPPro==0))
        return longest_match_7fff(s,cur_match);
 	if (iIsPPro==2)
 		iIsPPro = (((cpudetect32()/0x100)&0xf)>=6) ? 1 : 0;
 	return longest_match_c(s,cur_match);
 }
 uInt longest_match_c(s, cur_match)
    deflate_state *s;
    IPos cur_match;                             /* current match */
 {
    unsigned chain_length = s->max_chain_length;/* max hash chain length */
    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 */
    int nice_match = s->nice_match;             /* stop if match long enough */
    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
        s->strstart - (IPos)MAX_DIST(s) : NIL;
    /* Stop when cur_match becomes <= limit. To simplify the code,
     * we prevent matches with the string of window index 0.
     */
    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 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 Bytef *strend = s->window + s->strstart + MAX_MATCH;
    register Byte scan_end1  = scan[best_len-1];
    register Byte scan_end   = scan[best_len];
 #endif
    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
     * It is easy to get rid of this optimization if necessary.
     */
    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
    /* Do not waste too much time if we already have a good match: */
    if (s->prev_length >= s->good_match) {
        chain_length >>= 2;
    }
    /* Do not look for matches beyond the end of the input. This is necessary
     * to make deflate deterministic.
     */
    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
    do {
        Assert(cur_match < s->strstart, "no future");
        match = s->window + cur_match;
        /* Skip to next match if the match length cannot increase
         * or if the match length is less than 2:
         */
 #if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
        /* This code assumes sizeof(unsigned short) == 2. Do not use
         * UNALIGNED_OK if your compiler uses a different size.
         */
        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
         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
         * strstart+3, +5, ... up to strstart+257. We check for insufficient
         * lookahead only every 4th comparison; the 128th check will be made
         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
         * 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 (*(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 */
        /* Here, scan <= window+strstart+257 */
        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
        if (*scan == *match) scan++;
        len = (MAX_MATCH - 1) - (int)(strend-scan);
        scan = strend - (MAX_MATCH-1);
 #else /* UNALIGNED_OK */
        if (match[best_len]   != scan_end  ||
            match[best_len-1] != scan_end1 ||
            *match            != *scan     ||
            *++match          != scan[1])      continue;
        /* The check at best_len-1 can be removed because it will be made
         * again later. (This heuristic is not always a win.)
         * 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 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.
         */
        do {
        } while (*++scan == *++match && *++scan == *++match &&
                 *++scan == *++match && *++scan == *++match &&
                 *++scan == *++match && *++scan == *++match &&
                 *++scan == *++match && *++scan == *++match &&
                 scan < strend);
        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
        len = MAX_MATCH - (int)(strend - scan);
        scan = strend - MAX_MATCH;
 #endif /* UNALIGNED_OK */
        if (len > best_len) {
            s->match_start = cur_match;
            best_len = len;
            if (len >= nice_match) break;
 #ifdef UNALIGNED_OK
            scan_end = *(ushf*)(scan+best_len-1);
 #else
            scan_end1  = scan[best_len-1];
            scan_end   = scan[best_len];
 #endif
        }
    } while ((cur_match = prev[cur_match & wmask]) > limit
             && --chain_length != 0);
    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
    return s->lookahead;
 }
 #endif /* ASMV */
--- a/contrib/asm386/mkgvmt32.bat
+++ b/contrib/asm386/mkgvmt32.bat
@@ -0,0 +1 @@
 c:\masm611\bin\ml /coff /Zi /c /Flgvmat32.lst gvmat32.asm
--- a/contrib/asm386/zlibvc.dsp
+++ b/contrib/asm386/zlibvc.dsp
@@ -0,0 +1,612 @@
 # Microsoft Developer Studio Project File - Name="zlibvc" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 5.00
 # ** DO NOT EDIT **
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602
 CFG=zlibvc - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE NMAKE /f "zlibvc.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE NMAKE /f "zlibvc.mak" CFG="zlibvc - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "zlibvc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "zlibvc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "zlibvc - Win32 ReleaseAxp" (based on\
 "Win32 (ALPHA) Dynamic-Link Library")
 !MESSAGE "zlibvc - Win32 ReleaseWithoutAsm" (based on\
 "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "zlibvc - Win32 ReleaseWithoutCrtdll" (based on\
 "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir ".\Release"
 # PROP BASE Intermediate_Dir ".\Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ".\Release"
 # PROP Intermediate_Dir ".\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /D "ASMV" /FAcs /FR /YX /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 RSC=rc.exe
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
 # ADD RSC /l 0x40c /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
 # ADD LINK32 gvmat32.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\Release\zlib.dll"
 # SUBTRACT LINK32 /pdb:none
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir ".\Debug"
 # PROP BASE Intermediate_Dir ".\Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir ".\Debug"
 # PROP Intermediate_Dir ".\Debug"
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
 # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /YX /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 RSC=rc.exe
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
 # ADD RSC /l 0x40c /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:".\Debug\zlib.dll"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "zlibvc__"
 # PROP BASE Intermediate_Dir "zlibvc__"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "zlibvc__"
 # PROP Intermediate_Dir "zlibvc__"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 CPP=cl.exe
 # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /FAcs /FR /YX /FD /c
 # ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /FAcs /FR /YX /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
 # ADD RSC /l 0x40c /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 crtdll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /map /machine:ALPHA /nodefaultlib /out:".\Release\zlib.dll"
 # SUBTRACT BASE LINK32 /pdb:none
 # ADD LINK32 crtdll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /map /machine:ALPHA /nodefaultlib /out:"zlibvc__\zlib.dll"
 # SUBTRACT LINK32 /pdb:none
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "zlibvc_0"
 # PROP BASE Intermediate_Dir "zlibvc_0"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "zlibvc_0"
 # PROP Intermediate_Dir "zlibvc_0"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /FAcs /FR /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /FAcs /FR /YX /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 RSC=rc.exe
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
 # ADD RSC /l 0x40c /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\Release\zlib.dll"
 # SUBTRACT BASE LINK32 /pdb:none
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\zlibvc_0\zlib.dll"
 # SUBTRACT LINK32 /pdb:none
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "zlibvc_1"
 # PROP BASE Intermediate_Dir "zlibvc_1"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "zlibvc_1"
 # PROP Intermediate_Dir "zlibvc_1"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /D "ASMV" /FAcs /FR /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /D "ASMV" /FAcs /FR /YX /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 RSC=rc.exe
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
 # ADD RSC /l 0x40c /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 gvmat32.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\Release\zlib.dll"
 # SUBTRACT BASE LINK32 /pdb:none
 # ADD LINK32 gvmat32.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\zlibvc_1\zlib.dll"
 # SUBTRACT LINK32 /pdb:none
 !ENDIF 
 # Begin Target
 # Name "zlibvc - Win32 Release"
 # Name "zlibvc - Win32 Debug"
 # Name "zlibvc - Win32 ReleaseAxp"
 # Name "zlibvc - Win32 ReleaseWithoutAsm"
 # Name "zlibvc - Win32 ReleaseWithoutCrtdll"
 # Begin Group "Source Files"
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
 SOURCE=.\adler32.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_ADLER=\
 	".\zconf.h"\
 	".\zlib.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\compress.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_COMPR=\
 	".\zconf.h"\
 	".\zlib.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\crc32.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_CRC32=\
 	".\zconf.h"\
 	".\zlib.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\deflate.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_DEFLA=\
 	".\deflate.h"\
 	".\zconf.h"\
 	".\zlib.h"\
 	".\zutil.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\gvmat32c.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\gzio.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_GZIO_=\
 	".\zconf.h"\
 	".\zlib.h"\
 	".\zutil.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\infblock.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_INFBL=\
 	".\infblock.h"\
 	".\infcodes.h"\
 	".\inftrees.h"\
 	".\infutil.h"\
 	".\zconf.h"\
 	".\zlib.h"\
 	".\zutil.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\infcodes.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_INFCO=\
 	".\infblock.h"\
 	".\infcodes.h"\
 	".\inffast.h"\
 	".\inftrees.h"\
 	".\infutil.h"\
 	".\zconf.h"\
 	".\zlib.h"\
 	".\zutil.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\inffast.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_INFFA=\
 	".\infblock.h"\
 	".\infcodes.h"\
 	".\inffast.h"\
 	".\inftrees.h"\
 	".\infutil.h"\
 	".\zconf.h"\
 	".\zlib.h"\
 	".\zutil.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\inflate.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_INFLA=\
 	".\infblock.h"\
 	".\zconf.h"\
 	".\zlib.h"\
 	".\zutil.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\inftrees.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_INFTR=\
 	".\inftrees.h"\
 	".\zconf.h"\
 	".\zlib.h"\
 	".\zutil.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\infutil.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_INFUT=\
 	".\infblock.h"\
 	".\infcodes.h"\
 	".\inftrees.h"\
 	".\infutil.h"\
 	".\zconf.h"\
 	".\zlib.h"\
 	".\zutil.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\trees.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_TREES=\
 	".\deflate.h"\
 	".\zconf.h"\
 	".\zlib.h"\
 	".\zutil.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\uncompr.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_UNCOM=\
 	".\zconf.h"\
 	".\zlib.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # Begin Source File
 SOURCE=.\zlib.rc
 # End Source File
 # Begin Source File
 SOURCE=.\zlibvc.def
 # End Source File
 # Begin Source File
 SOURCE=.\zutil.c
 !IF  "$(CFG)" == "zlibvc - Win32 Release"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 Debug"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
 DEP_CPP_ZUTIL=\
 	".\zconf.h"\
 	".\zlib.h"\
 	".\zutil.h"\
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
 !ENDIF 
 # End Source File
 # End Group
 # Begin Group "Header Files"
 # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
 # Begin Source File
 SOURCE=.\deflate.h
 # End Source File
 # Begin Source File
 SOURCE=.\infblock.h
 # End Source File
 # Begin Source File
 SOURCE=.\infcodes.h
 # End Source File
 # Begin Source File
 SOURCE=.\inffast.h
 # End Source File
 # Begin Source File
 SOURCE=.\inftrees.h
 # End Source File
 # Begin Source File
 SOURCE=.\infutil.h
 # End Source File
 # Begin Source File
 SOURCE=.\zconf.h
 # End Source File
 # Begin Source File
 SOURCE=.\zlib.h
 # End Source File
 # Begin Source File
 SOURCE=.\zutil.h
 # End Source File
 # End Group
 # Begin Group "Resource Files"
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
 # End Group
 # End Target
 # End Project
--- a/contrib/asm386/zlibvc.dsw
+++ b/contrib/asm386/zlibvc.dsw
@@ -0,0 +1,29 @@
 Microsoft Developer Studio Workspace File, Format Version 5.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 ###############################################################################
 Project: "zlibvc"=".\zlibvc.dsp" - Package Owner=<4>
 Package=<5>
 {{{
 }}}
 Package=<4>
 {{{
 }}}
 ###############################################################################
 Global:
 Package=<5>
 {{{
 }}}
 Package=<3>
 {{{
 }}}
 ###############################################################################
--- a/contrib/iostream/test.cpp
+++ b/contrib/iostream/test.cpp
@@ -0,0 +1,24 @@
 #include "zfstream.h"
 int main() {
  // Construct a stream object with this filebuffer.  Anything sent
  // to this stream will go to standard out.
  gzofstream os( 1, ios::out );
  // This text is getting compressed and sent to stdout.
  // To prove this, run 'test | zcat'.
  os << "Hello, Mommy" << endl;
  os << setcompressionlevel( Z_NO_COMPRESSION );
  os << "hello, hello, hi, ho!" << endl;
  setcompressionlevel( os, Z_DEFAULT_COMPRESSION )
    << "I'm compressing again" << endl;
  os.close();
  return 0;
 }
--- a/contrib/iostream/zfstream.cpp
+++ b/contrib/iostream/zfstream.cpp
@@ -0,0 +1,329 @@
 #include <memory.h>
 #include "zfstream.h"
 gzfilebuf::gzfilebuf() :
  file(NULL),
  mode(0),
  own_file_descriptor(0)
 { }
 gzfilebuf::~gzfilebuf() {
  sync();
  if ( own_file_descriptor )
    close();
 }
 gzfilebuf *gzfilebuf::open( const char *name,
 			    int io_mode ) {
  if ( is_open() )
    return NULL;
  char char_mode[10];
  char *p;
  memset(char_mode,'\0',10);
  p = char_mode;
  if ( io_mode & ios::in ) {
    mode = ios::in;
    *p++ = 'r';
  } else if ( io_mode & ios::app ) {
    mode = ios::app;
    *p++ = 'a';
  } else {
    mode = ios::out;
    *p++ = 'w';
  }
  if ( io_mode & ios::binary ) {
    mode |= ios::binary;
    *p++ = 'b';
  }
  // Hard code the compression level
  if ( io_mode & (ios::out|ios::app )) {
    *p++ = '9';
  }
  if ( (file = gzopen(name, char_mode)) == NULL )
    return NULL;
  own_file_descriptor = 1;
  return this;
 }
 gzfilebuf *gzfilebuf::attach( int file_descriptor,
 			      int io_mode ) {
  if ( is_open() )
    return NULL;
  char char_mode[10];
  char *p;
  memset(char_mode,'\0',10);
  p = char_mode;
  if ( io_mode & ios::in ) {
    mode = ios::in;
    *p++ = 'r';
  } else if ( io_mode & ios::app ) {
    mode = ios::app;
    *p++ = 'a';
  } else {
    mode = ios::out;
    *p++ = 'w';
  }
  if ( io_mode & ios::binary ) {
    mode |= ios::binary;
    *p++ = 'b';
  }
  // Hard code the compression level
  if ( io_mode & (ios::out|ios::app )) {
    *p++ = '9';
  }
  if ( (file = gzdopen(file_descriptor, char_mode)) == NULL )
    return NULL;
  own_file_descriptor = 0;
  return this;
 }
 gzfilebuf *gzfilebuf::close() {
  if ( is_open() ) {
    sync();
    gzclose( file );
    file = NULL;
  }
  return this;
 }
 int gzfilebuf::setcompressionlevel( short comp_level ) {
  return gzsetparams(file, comp_level, -2);
 }
 int gzfilebuf::setcompressionstrategy( short comp_strategy ) {
  return gzsetparams(file, -2, comp_strategy);
 }
 streampos gzfilebuf::seekoff( streamoff off, ios::seek_dir dir, int which ) {
  return streampos(EOF);
 }
 int gzfilebuf::underflow() {
  // If the file hasn't been opened for reading, error.
  if ( !is_open() || !(mode & ios::in) )
    return EOF;
  // if a buffer doesn't exists, allocate one.
  if ( !base() ) {
    if ( (allocate()) == EOF )
      return EOF;
    setp(0,0);
  } else {
    if ( in_avail() )
      return (unsigned char) *gptr();
    if ( out_waiting() ) {
      if ( flushbuf() == EOF )
 	return EOF;
    }
  }
  // Attempt to fill the buffer.
  int result = fillbuf();
  if ( result == EOF ) {
    // disable get area
    setg(0,0,0);
    return EOF;
  }
  return (unsigned char) *gptr();
 }
 int gzfilebuf::overflow( int c ) {
  if ( !is_open() || !(mode & ios::out) )
    return EOF;
  if ( !base() ) {
    if ( allocate() == EOF )
      return EOF;
    setg(0,0,0);
  } else {
    if (in_avail()) {
 	return EOF;
    }
    if (out_waiting()) {
      if (flushbuf() == EOF)
 	return EOF;
    }
  }
  int bl = blen();
  setp( base(), base() + bl);
  if ( c != EOF ) {
    *pptr() = c;
    pbump(1);
  }
  return 0;
 }
 int gzfilebuf::sync() {
  if ( !is_open() )
    return EOF;
  if ( out_waiting() )
    return flushbuf();
  return 0;
 }
 int gzfilebuf::flushbuf() {
  int n;
  char *q;
  q = pbase();
  n = pptr() - q;
  if ( gzwrite( file, q, n) < n )
    return EOF;
  setp(0,0);
  return 0;
 }
 int gzfilebuf::fillbuf() {
  int required;
  char *p;
  p = base();
  required = blen();
  int t = gzread( file, p, required );
  if ( t <= 0) return EOF;
  setg( base(), base(), base()+t);
  return t;
 }
 gzfilestream_common::gzfilestream_common() :
  ios( gzfilestream_common::rdbuf() )
 { }
 gzfilestream_common::~gzfilestream_common()
 { }
 void gzfilestream_common::attach( int fd, int io_mode ) {
  if ( !buffer.attach( fd, io_mode) )
    clear( ios::failbit | ios::badbit );
  else
    clear();
 }
 void gzfilestream_common::open( const char *name, int io_mode ) {
  if ( !buffer.open( name, io_mode ) )
    clear( ios::failbit | ios::badbit );
  else
    clear();
 }
 void gzfilestream_common::close() {
  if ( !buffer.close() )
    clear( ios::failbit | ios::badbit );
 }
 gzfilebuf *gzfilestream_common::rdbuf() {
  return &buffer;
 }
 gzifstream::gzifstream() :
  ios( gzfilestream_common::rdbuf() )
 {
  clear( ios::badbit );
 }
 gzifstream::gzifstream( const char *name, int io_mode ) :
  ios( gzfilestream_common::rdbuf() )
 {
  gzfilestream_common::open( name, io_mode );
 }
 gzifstream::gzifstream( int fd, int io_mode ) :
  ios( gzfilestream_common::rdbuf() )
 {
  gzfilestream_common::attach( fd, io_mode );
 }
 gzifstream::~gzifstream() { }
 gzofstream::gzofstream() :
  ios( gzfilestream_common::rdbuf() )
 {
  clear( ios::badbit );
 }
 gzofstream::gzofstream( const char *name, int io_mode ) :
  ios( gzfilestream_common::rdbuf() )
 {
  gzfilestream_common::open( name, io_mode );
 }
 gzofstream::gzofstream( int fd, int io_mode ) :
  ios( gzfilestream_common::rdbuf() )
 {
  gzfilestream_common::attach( fd, io_mode );
 }
 gzofstream::~gzofstream() { }
--- a/contrib/iostream/zfstream.h
+++ b/contrib/iostream/zfstream.h
@@ -0,0 +1,142 @@
 #ifndef _zfstream_h
 #define _zfstream_h
 #include <fstream.h>
 #include "zlib.h"
 class gzfilebuf : public streambuf {
 public:
  gzfilebuf( );
  virtual ~gzfilebuf();
  gzfilebuf *open( const char *name, int io_mode );
  gzfilebuf *attach( int file_descriptor, int io_mode );
  gzfilebuf *close();
  int setcompressionlevel( short comp_level );
  int setcompressionstrategy( short comp_strategy );
  inline int is_open() const { return (file !=NULL); }
  virtual streampos seekoff( streamoff, ios::seek_dir, int );
  virtual int sync();
 protected:
  virtual int underflow();
  virtual int overflow( int = EOF );
 private:
  gzFile file;
  short mode;
  short own_file_descriptor;
  int flushbuf();
  int fillbuf();
 };
 class gzfilestream_common : virtual public ios {
  friend class gzifstream;
  friend class gzofstream;
  friend gzofstream &setcompressionlevel( gzofstream &, int );
  friend gzofstream &setcompressionstrategy( gzofstream &, int );
 public:
  virtual ~gzfilestream_common();
  void attach( int fd, int io_mode );
  void open( const char *name, int io_mode );
  void close();
 protected:
  gzfilestream_common();
 private:
  gzfilebuf *rdbuf();
  gzfilebuf buffer;
 };
 class gzifstream : public gzfilestream_common, public istream {
 public:
  gzifstream();
  gzifstream( const char *name, int io_mode = ios::in );
  gzifstream( int fd, int io_mode = ios::in );
  virtual ~gzifstream();
 };
 class gzofstream : public gzfilestream_common, public ostream {
 public:
  gzofstream();
  gzofstream( const char *name, int io_mode = ios::out );
  gzofstream( int fd, int io_mode = ios::out );
  virtual ~gzofstream();
 };
 template<class T> class gzomanip {
  friend gzofstream &operator<<(gzofstream &, const gzomanip<T> &);
 public:
  gzomanip(gzofstream &(*f)(gzofstream &, T), T v) : func(f), val(v) { }
 private:
  gzofstream &(*func)(gzofstream &, T);
  T val;
 };
 template<class T> gzofstream &operator<<(gzofstream &s,
 					 const gzomanip<T> &m) {
  return (*m.func)(s, m.val);
 }
 inline gzofstream &setcompressionlevel( gzofstream &s, int l ) {
  (s.rdbuf())->setcompressionlevel(l);
  return s;
 }
 inline gzofstream &setcompressionstrategy( gzofstream &s, int l ) {
  (s.rdbuf())->setcompressionstrategy(l);
  return s;
 }
 inline gzomanip<int> setcompressionlevel(int l)
 {
  return gzomanip<int>(&setcompressionlevel,l);
 }
 inline gzomanip<int> setcompressionstrategy(int l)
 {
  return gzomanip<int>(&setcompressionstrategy,l);
 }
 #endif
--- a/contrib/iostream2/zstream.h
+++ b/contrib/iostream2/zstream.h
@@ -0,0 +1,307 @@
 /*
 *
 * Copyright (c) 1997
 * Christian Michelsen Research AS
 * Advanced Computing
 * Fantoftvegen 38, 5036 BERGEN, Norway
 * http://www.cmr.no
 *
 * Permission to use, copy, modify, distribute and sell this software
 * and its documentation for any purpose is hereby granted without fee,
 * provided that the above copyright notice appear in all copies and
 * that both that copyright notice and this permission notice appear
 * in supporting documentation.  Christian Michelsen Research AS makes no
 * representations about the suitability of this software for any
 * purpose.  It is provided "as is" without express or implied warranty.
 *
 */
 #ifndef ZSTREAM__H
 #define ZSTREAM__H
 /*
 * zstream.h - C++ interface to the 'zlib' general purpose compression library
 * $Id: zstream.h 1.1 1997-06-25 12:00:56+02 tyge Exp tyge $
 */
 #include <strstream.h>
 #include <string.h>
 #include <stdio.h>
 #include "zlib.h"
 #if defined(_WIN32)
 #   include <fcntl.h>
 #   include <io.h>
 #   define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
 #else
 #   define SET_BINARY_MODE(file)
 #endif
 class zstringlen {
 public:
    zstringlen(class izstream&);
    zstringlen(class ozstream&, const char*);
    size_t value() const { return val.word; }
 private:
    struct Val { unsigned char byte; size_t word; } val;
 };
 //  ----------------------------- izstream -----------------------------
 class izstream
 {
    public:
        izstream() : m_fp(0) {}
        izstream(FILE* fp) : m_fp(0) { open(fp); }
        izstream(const char* name) : m_fp(0) { open(name); }
        ~izstream() { close(); }
        /* Opens a gzip (.gz) file for reading.
         * open() can be used to read a file which is not in gzip format;
         * in this case read() will directly read from the file without
         * decompression. errno can be checked to distinguish two error
         * cases (if errno is zero, the zlib error is Z_MEM_ERROR).
         */
        void open(const char* name) {
            if (m_fp) close();
            m_fp = ::gzopen(name, "rb");
        }
        void open(FILE* fp) {
            SET_BINARY_MODE(fp);
            if (m_fp) close();
            m_fp = ::gzdopen(fileno(fp), "rb");
        }
        /* Flushes all pending input if necessary, closes the compressed file
         * and deallocates all the (de)compression state. The return value is
         * the zlib error number (see function error() below).
         */
        int close() {
            int r = ::gzclose(m_fp);
            m_fp = 0; return r;
        }
        /* Binary read the given number of bytes from the compressed file.
         */
        int read(void* buf, size_t len) {
            return ::gzread(m_fp, buf, len);
        }
        /* Returns the error message for the last error which occurred on the
         * given compressed file. errnum is set to zlib error number. If an
         * error occurred in the file system and not in the compression library,
         * errnum is set to Z_ERRNO and the application may consult errno
         * to get the exact error code.
         */
        const char* error(int* errnum) {
            return ::gzerror(m_fp, errnum);
        }
        gzFile fp() { return m_fp; }
    private:
        gzFile m_fp;
 };
 /*
 * Binary read the given (array of) object(s) from the compressed file.
 * If the input file was not in gzip format, read() copies the objects number
 * of bytes into the buffer.
 * returns the number of uncompressed bytes actually read
 * (0 for end of file, -1 for error).
 */
 template <class T, class Items>
 inline int read(izstream& zs, T* x, Items items) {
    return ::gzread(zs.fp(), x, items*sizeof(T));
 }
 /*
 * Binary input with the '>' operator.
 */
 template <class T>
 inline izstream& operator>(izstream& zs, T& x) {
    ::gzread(zs.fp(), &x, sizeof(T));
    return zs;
 }
 inline zstringlen::zstringlen(izstream& zs) {
    zs > val.byte;
    if (val.byte == 255) zs > val.word;
    else val.word = val.byte;
 }
 /*
 * Read length of string + the string with the '>' operator.
 */
 inline izstream& operator>(izstream& zs, char* x) {
    zstringlen len(zs);
    ::gzread(zs.fp(), x, len.value());
    x[len.value()] = '\0';
    return zs;
 }
 inline char* read_string(izstream& zs) {
    zstringlen len(zs);
    char* x = new char[len.value()+1];
    ::gzread(zs.fp(), x, len.value());
    x[len.value()] = '\0';
    return x;
 }
 // ----------------------------- ozstream -----------------------------
 class ozstream
 {
    public:
        ozstream() : m_fp(0), m_os(0) {
        }
        ozstream(FILE* fp, int level = Z_DEFAULT_COMPRESSION)
            : m_fp(0), m_os(0) {
            open(fp, level);
        }
        ozstream(const char* name, int level = Z_DEFAULT_COMPRESSION)
            : m_fp(0), m_os(0) {
            open(name, level);
        }
        ~ozstream() {
            close();
        }
        /* Opens a gzip (.gz) file for writing.
         * The compression level parameter should be in 0..9
         * errno can be checked to distinguish two error cases
         * (if errno is zero, the zlib error is Z_MEM_ERROR).
         */
        void open(const char* name, int level = Z_DEFAULT_COMPRESSION) {
            char mode[4] = "wb\0";
            if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level;
            if (m_fp) close();
            m_fp = ::gzopen(name, mode);
        }
        /* open from a FILE pointer.
         */
        void open(FILE* fp, int level = Z_DEFAULT_COMPRESSION) {
            SET_BINARY_MODE(fp);
            char mode[4] = "wb\0";
            if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level;
            if (m_fp) close();
            m_fp = ::gzdopen(fileno(fp), mode);
        }
        /* 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 error() below).
         */
        int close() {
            if (m_os) {
                ::gzwrite(m_fp, m_os->str(), m_os->pcount());
                delete[] m_os->str(); delete m_os; m_os = 0;
            }
            int r = ::gzclose(m_fp); m_fp = 0; return r;
        }
        /* Binary write the given number of bytes into the compressed file.
         */
        int write(const void* buf, size_t len) {
            return ::gzwrite(m_fp, (voidp) buf, len);
        }
        /* Flushes all pending output into the compressed file. The parameter
         * _flush is as in the deflate() function. The return value is the zlib
         * error number (see function gzerror below). flush() returns Z_OK if
         * the flush_ parameter is Z_FINISH and all output could be flushed.
         * flush() should be called only when strictly necessary because it can
         * degrade compression.
         */
        int flush(int _flush) {
            os_flush();
            return ::gzflush(m_fp, _flush);
        }
        /* Returns the error message for the last error which occurred on the
         * given compressed file. errnum is set to zlib error number. If an
         * error occurred in the file system and not in the compression library,
         * errnum is set to Z_ERRNO and the application may consult errno
         * to get the exact error code.
         */
        const char* error(int* errnum) {
            return ::gzerror(m_fp, errnum);
        }
        gzFile fp() { return m_fp; }
        ostream& os() {
            if (m_os == 0) m_os = new ostrstream;
            return *m_os;
        }
        void os_flush() {
            if (m_os && m_os->pcount()>0) {
                ostrstream* oss = new ostrstream;
                oss->fill(m_os->fill());
                oss->flags(m_os->flags());
                oss->precision(m_os->precision());
                oss->width(m_os->width());
                ::gzwrite(m_fp, m_os->str(), m_os->pcount());
                delete[] m_os->str(); delete m_os; m_os = oss;
            }
        }
    private:
        gzFile m_fp;
        ostrstream* m_os;
 };
 /*
 * Binary write the given (array of) object(s) into the compressed file.
 * returns the number of uncompressed bytes actually written
 * (0 in case of error).
 */
 template <class T, class Items>
 inline int write(ozstream& zs, const T* x, Items items) {
    return ::gzwrite(zs.fp(), (voidp) x, items*sizeof(T));
 }
 /*
 * Binary output with the '<' operator.
 */
 template <class T>
 inline ozstream& operator<(ozstream& zs, const T& x) {
    ::gzwrite(zs.fp(), (voidp) &x, sizeof(T));
    return zs;
 }
 inline zstringlen::zstringlen(ozstream& zs, const char* x) {
    val.byte = 255;  val.word = ::strlen(x);
    if (val.word < 255) zs < (val.byte = val.word);
    else zs < val;
 }
 /*
 * Write length of string + the string with the '<' operator.
 */
 inline ozstream& operator<(ozstream& zs, const char* x) {
    zstringlen len(zs, x);
    ::gzwrite(zs.fp(), (voidp) x, len.value());
    return zs;
 }
 #ifdef _MSC_VER
 inline ozstream& operator<(ozstream& zs, char* const& x) {
    return zs < (const char*) x;
 }
 #endif
 /*
 * Ascii write with the << operator;
 */
 template <class T>
 inline ostream& operator<<(ozstream& zs, const T& x) {
    zs.os_flush();
    return zs.os() << x;
 }
 #endif
--- a/contrib/iostream2/zstream_test.cpp
+++ b/contrib/iostream2/zstream_test.cpp
@@ -0,0 +1,25 @@
 #include "zstream.h"
 #include <math.h>
 #include <stdlib.h>
 #include <iomanip.h>
 void main() {
 	char h[256] = "Hello";
 	char* g = "Goodbye";
 	ozstream out("temp.gz");
    out < "This works well" < h < g;
    out.close();
    izstream in("temp.gz"); // read it back
    char *x = read_string(in), *y = new char[256], z[256];
    in > y > z;
    in.close();
    cout << x << endl << y << endl << z << endl;
    out.open("temp.gz"); // try ascii output; zcat temp.gz to see the results
    out << setw(50) << setfill('#') << setprecision(20) << x << endl << y << endl << z << endl;
    out << z << endl << y << endl << x << endl;
    out << 1.1234567890123456789 << endl;
    delete[] x; delete[] y;
 }
--- a/contrib/untgz/Makefile
+++ b/contrib/untgz/Makefile
@@ -0,0 +1,14 @@
 CC=cc
 CFLAGS=-g
 untgz: untgz.o  ../../libz.a
 	$(CC) $(CFLAGS) -o untgz  untgz.o -L../.. -lz
 untgz.o: untgz.c ../../zlib.h
 	$(CC) $(CFLAGS) -c -I../.. untgz.c
 ../../libz.a:
 	cd ../..; make
 clean:
 	rm -f untgz untgz.o *~
--- a/contrib/untgz/makefile.w32
+++ b/contrib/untgz/makefile.w32
@@ -0,0 +1,63 @@
 # Makefile for zlib.  Modified for mingw32
 # For conditions of distribution and use, see copyright notice in zlib.h 
 # To compile, 
 # 
 #   make -fmakefile.w32
 # 
 CC=gcc
 # Generate dependencies (see end of the file)
 CPPFLAGS=-MMD 
 #CFLAGS=-MMD -O
 #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 #CFLAGS=-MMD -g -DDEBUG
 CFLAGS=-O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
             -Wstrict-prototypes -Wmissing-prototypes
 # If cp.exe is not found, replace with copy /Y .
 CP=cp -f
 # The default value of RM is "rm -f."  
 # If "rm.exe" is not found, uncomment:
 # RM=del
 LD=gcc
 LDLIBS=-L. -lz
 LDFLAGS=-s
 INCL=zlib.h zconf.h
 LIBS=libz.a
 AR=ar rcs
 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 = minigzip.o untgz.o
 all: minigzip.exe untgz.exe
 rebuild:	clean	all
 libz.a: $(OBJS)
 	$(AR) $@ $(OBJS)
 %.exe : %.o $(LIBS)
 	$(LD) $(LDFLAGS) -o $@ $< $(LDLIBS)
 .PHONY : clean
 clean:
 	$(RM) *.d *.o *.exe libz.a foo.gz
 DEPS := $(wildcard *.d)
 ifneq ($(DEPS),)
 include $(DEPS)
 endif
--- a/contrib/untgz/untgz.c
+++ b/contrib/untgz/untgz.c
@@ -0,0 +1,478 @@
 /*
 * untgz.c -- Display contents and/or extract file from
 * a gzip'd TAR file
 * written by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
 * adaptation to Unix by Jean-loup Gailly <jloup@gzip.org>
 */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <utime.h>
 #include <errno.h>
 #include <fcntl.h>
 #ifdef unix
 # include <unistd.h>
 #else
 # include <direct.h>
 # include <io.h>
 #endif
 #include "zlib.h"
 /* Values used in typeflag field.  */
 #define REGTYPE	 '0'		/* regular file */
 #define AREGTYPE '\0'		/* regular file */
 #define LNKTYPE  '1'		/* link */
 #define SYMTYPE  '2'		/* reserved */
 #define CHRTYPE  '3'		/* character special */
 #define BLKTYPE  '4'		/* block special */
 #define DIRTYPE  '5'		/* directory */
 #define FIFOTYPE '6'		/* FIFO special */
 #define CONTTYPE '7'		/* reserved */
 #define BLOCKSIZE 512
 struct tar_header
 {				/* byte offset */
  char name[100];		/*   0 */
  char mode[8];			/* 100 */
  char uid[8];			/* 108 */
  char gid[8];			/* 116 */
  char size[12];		/* 124 */
  char mtime[12];		/* 136 */
  char chksum[8];		/* 148 */
  char typeflag;		/* 156 */
  char linkname[100];		/* 157 */
  char magic[6];		/* 257 */
  char version[2];		/* 263 */
  char uname[32];		/* 265 */
  char gname[32];		/* 297 */
  char devmajor[8];		/* 329 */
  char devminor[8];		/* 337 */
  char prefix[155];		/* 345 */
 				/* 500 */
 };
 union tar_buffer {
  char               buffer[BLOCKSIZE];
  struct tar_header  header;
 };
 enum { TGZ_EXTRACT = 0, TGZ_LIST };
 static char *TGZfname	OF((const char *));
 void TGZnotfound	OF((const char *));
 int getoct		OF((char *, int));
 char *strtime		OF((time_t *));
 int ExprMatch		OF((char *,char *));
 int makedir		OF((char *));
 int matchname		OF((int,int,char **,char *));
 void error		OF((const char *));
 int  tar		OF((gzFile, int, int, int, char **));
 void help		OF((int));
 int main		OF((int, char **));
 char *prog;
 /* This will give a benign warning */
 static char *TGZprefix[] = { "\0", ".tgz", ".tar.gz", NULL };
 /* Return the real name of the TGZ archive */
 /* or NULL if it does not exist. */
 static char *TGZfname OF((const char *fname))
 {
  static char buffer[1024];
  int origlen,i;
  strcpy(buffer,fname);
  origlen = strlen(buffer);
  for (i=0; TGZprefix[i]; i++)
    {
       strcpy(buffer+origlen,TGZprefix[i]);
       if (access(buffer,F_OK) == 0)
         return buffer;
    }
  return NULL;
 }
 /* error message for the filename */
 void TGZnotfound OF((const char *fname))
 {
  int i;
  fprintf(stderr,"%s : couldn't find ",prog);
  for (i=0;TGZprefix[i];i++)
    fprintf(stderr,(TGZprefix[i+1]) ? "%s%s, " : "or %s%s\n",
            fname,
            TGZprefix[i]);
  exit(1);
 }
 /* help functions */
 int getoct(char *p,int width)
 {
  int result = 0;
  char c;
  while (width --)
    {
      c = *p++;
      if (c == ' ')
 	continue;
      if (c == 0)
 	break;
      result = result * 8 + (c - '0');
    }
  return result;
 }
 char *strtime (time_t *t)
 {
  struct tm   *local;
  static char result[32];
  local = localtime(t);
  sprintf(result,"%2d/%02d/%4d %02d:%02d:%02d",
 	  local->tm_mday, local->tm_mon+1, local->tm_year+1900,
 	  local->tm_hour, local->tm_min,   local->tm_sec);
  return result;
 }
 /* regular expression matching */
 #define ISSPECIAL(c) (((c) == '*') || ((c) == '/'))
 int ExprMatch(char *string,char *expr)
 {
  while (1)
    {
      if (ISSPECIAL(*expr))
 	{
 	  if (*expr == '/')
 	    {
 	      if (*string != '\\' && *string != '/')
 		return 0;
 	      string ++; expr++;
 	    }
 	  else if (*expr == '*')
 	    {
 	      if (*expr ++ == 0)
 		return 1;
 	      while (*++string != *expr)
 		if (*string == 0)
 		  return 0;
 	    }
 	}
      else
 	{
 	  if (*string != *expr)
 	    return 0;
 	  if (*expr++ == 0)
 	    return 1;
 	  string++;
 	}
    }
 }
 /* recursive make directory */
 /* abort if you get an ENOENT errno somewhere in the middle */
 /* e.g. ignore error "mkdir on existing directory" */
 /* */
 /* return 1 if OK */
 /*        0 on error */
 int makedir (char *newdir)
 {
  char *buffer = strdup(newdir);
  char *p;
  int  len = strlen(buffer);
  if (len <= 0) {
    free(buffer);
    return 0;
  }
  if (buffer[len-1] == '/') {
    buffer[len-1] = '\0';
  }
  if (mkdir(buffer, 0775) == 0)
    {
      free(buffer);
      return 1;
    }
  p = buffer+1;
  while (1)
    {
      char hold;
      while(*p && *p != '\\' && *p != '/')
 	p++;
      hold = *p;
      *p = 0;
      if ((mkdir(buffer, 0775) == -1) && (errno == ENOENT))
 	{
 	  fprintf(stderr,"%s: couldn't create directory %s\n",prog,buffer);
 	  free(buffer);
 	  return 0;
 	}
      if (hold == 0)
 	break;
      *p++ = hold;
    }
  free(buffer);
  return 1;
 }
 int matchname (int arg,int argc,char **argv,char *fname)
 {
  if (arg == argc)		/* no arguments given (untgz tgzarchive) */
    return 1;
  while (arg < argc)
    if (ExprMatch(fname,argv[arg++]))
      return 1;
  return 0; /* ignore this for the moment being */
 }
 /* Tar file list or extract */
 int tar (gzFile in,int action,int arg,int argc,char **argv)
 {
  union  tar_buffer buffer;
  int    len;
  int    err;
  int    getheader = 1;
  int    remaining = 0;
  FILE   *outfile = NULL;
  char   fname[BLOCKSIZE];
  time_t tartime;
  if (action == TGZ_LIST)
    printf("     day      time     size                       file\n"
 	   " ---------- -------- --------- -------------------------------------\n");
  while (1)
    {
      len = gzread(in, &buffer, BLOCKSIZE);
      if (len < 0)
 	error (gzerror(in, &err));
      /*
       * if we met the end of the tar
       * or the end-of-tar block,
       * we are done
       */
      if ((len == 0)  || (buffer.header.name[0]== 0))
 	break;
      /*
       * Always expect complete blocks to process
       * the tar information.
       */
      if (len != BLOCKSIZE)
 	error("gzread: incomplete block read");
      /*
       * If we have to get a tar header
       */
      if (getheader == 1)
 	{
 	  tartime = (time_t)getoct(buffer.header.mtime,12);
 	  strcpy(fname,buffer.header.name);
 	  switch (buffer.header.typeflag)
 	    {
 	    case DIRTYPE:
 	      if (action == TGZ_LIST)
 		printf(" %s     <dir> %s\n",strtime(&tartime),fname);
 	      if (action == TGZ_EXTRACT)
 		makedir(fname);
 	      break;
 	    case REGTYPE:
 	    case AREGTYPE:
 	      remaining = getoct(buffer.header.size,12);
 	      if (action == TGZ_LIST)
 		printf(" %s %9d %s\n",strtime(&tartime),remaining,fname);
 	      if (action == TGZ_EXTRACT)
 		{
 		  if ((remaining) && (matchname(arg,argc,argv,fname)))
 		    {
 		      outfile = fopen(fname,"wb");
 		      if (outfile == NULL) {
 			/* try creating directory */
 			char *p = strrchr(fname, '/');
 			if (p != NULL) {
 			  *p = '\0';
 			  makedir(fname);
 			  *p = '/';
 			  outfile = fopen(fname,"wb");
 			}
 		      }
 		      fprintf(stderr,
 			      "%s %s\n",
 			      (outfile) ? "Extracting" : "Couldn't create",
 			      fname);
 		    }
 		  else
 		    outfile = NULL;
 		}
 	      /*
 	       * could have no contents
 	       */
 	      getheader = (remaining) ? 0 : 1;
 	      break;
 	    default:
 	      if (action == TGZ_LIST)
 		printf(" %s     <---> %s\n",strtime(&tartime),fname);
 	      break;
 	    }
 	}
      else
 	{
 	  unsigned int bytes = (remaining > BLOCKSIZE) ? BLOCKSIZE : remaining;
 	  if ((action == TGZ_EXTRACT) && (outfile != NULL))
 	    {
 	      if (fwrite(&buffer,sizeof(char),bytes,outfile) != bytes)
 		{
 		  fprintf(stderr,"%s : error writing %s skipping...\n",prog,fname);
 		  fclose(outfile);
 		  unlink(fname);
 		}
 	    }
 	  remaining -= bytes;
 	  if (remaining == 0)
 	    {
 	      getheader = 1;
 	      if ((action == TGZ_EXTRACT) && (outfile != NULL))
 		{
 		  struct utimbuf settime;
 		  settime.actime = settime.modtime = tartime;
 		  fclose(outfile);
 		  outfile = NULL;
 		  utime(fname,&settime);
 		}
 	    }
 	}
    }
  if (gzclose(in) != Z_OK)
    error("failed gzclose");
  return 0;
 }
 /* =========================================================== */
 void help(int exitval)
 {
  fprintf(stderr,
 	  "untgz v 0.1\n"
 	  " an sample application of zlib 1.0.4\n\n"
          "Usage : untgz TGZfile            to extract all files\n"
          "        untgz TGZfile fname ...  to extract selected files\n"
          "        untgz -l TGZfile         to list archive contents\n"
          "        untgz -h                 to display this help\n\n");
  exit(exitval);
 }
 void error(const char *msg)
 {
    fprintf(stderr, "%s: %s\n", prog, msg);
    exit(1);
 }
 /* ====================================================================== */
 int _CRT_glob = 0;	/* disable globbing of the arguments */
 int main(int argc,char **argv)
 {
    int 	action = TGZ_EXTRACT;
    int 	arg = 1;
    char	*TGZfile;
    gzFile	*f;
    prog = strrchr(argv[0],'\\');
    if (prog == NULL)
      {
 	prog = strrchr(argv[0],'/');
 	if (prog == NULL)
 	  {
 	    prog = strrchr(argv[0],':');
 	    if (prog == NULL)
 	      prog = argv[0];
 	    else
 	      prog++;
 	  }
 	else
 	  prog++;
      }
    else
      prog++;
    if (argc == 1)
      help(0);
    if (strcmp(argv[arg],"-l") == 0)
      {
 	action = TGZ_LIST;
 	if (argc == ++arg)
 	  help(0);
      }
    else if (strcmp(argv[arg],"-h") == 0)
      {
 	help(0);
      }
    if ((TGZfile = TGZfname(argv[arg])) == NULL)
      TGZnotfound(argv[arg]);            
    ++arg;
    if ((action == TGZ_LIST) && (arg != argc))
      help(1);
 /*
 *  Process the TGZ file
 */
    switch(action)
      {
      case TGZ_LIST:
      case TGZ_EXTRACT:
 	f = gzopen(TGZfile,"rb");
 	if (f == NULL)
 	  {
 	    fprintf(stderr,"%s: Couldn't gzopen %s\n",
 		    prog,
 		    TGZfile);
 	    return 1;
 	  }
 	exit(tar(f, action, arg, argc, argv));
      break;
      default:
 	error("Unknown option!");
 	exit(1);
      }
    return 0;
 }
--- a/contrib/visual-basic.txt
+++ b/contrib/visual-basic.txt
@@ -0,0 +1,57 @@
 From: "Jon Caruana" <jon-net@usa.net>
 To: "Jean-loup Gailly" <gzip@prep.ai.mit.edu>
 Subject: Re: How to port zlib declares to vb?
 Date: Mon, 28 Oct 1996 18:33:03 -0600
 Got the answer! (I haven't had time to check this but it's what I got, and
 looks correct):
 He has the following routines working:
        compress
        uncompress
        gzopen
        gzwrite
        gzread
        gzclose
 Declares follow: (Quoted from Carlos Rios <c_rios@sonda.cl>, in Vb4 form)
 #If Win16 Then   'Use Win16 calls.
 Declare Function compress Lib "ZLIB.DLL" (ByVal compr As
        String, comprLen As Any, ByVal buf As String, ByVal buflen
        As Long) As Integer
 Declare Function uncompress Lib "ZLIB.DLL" (ByVal uncompr
        As String, uncomprLen As Any, ByVal compr As String, ByVal
        lcompr As Long) As Integer
 Declare Function gzopen Lib "ZLIB.DLL" (ByVal filePath As
        String, ByVal mode As String) As Long
 Declare Function gzread Lib "ZLIB.DLL" (ByVal file As
        Long, ByVal uncompr As String, ByVal uncomprLen As Integer)
        As Integer
 Declare Function gzwrite Lib "ZLIB.DLL" (ByVal file As
        Long, ByVal uncompr As String, ByVal uncomprLen As Integer)
        As Integer
 Declare Function gzclose Lib "ZLIB.DLL" (ByVal file As
        Long) As Integer
 #Else
 Declare Function compress Lib "ZLIB32.DLL"
        (ByVal compr As String, comprLen As Any, ByVal buf As
        String, ByVal buflen As Long) As Integer
 Declare Function uncompress Lib "ZLIB32.DLL"
        (ByVal uncompr As String, uncomprLen As Any, ByVal compr As
        String, ByVal lcompr As Long) As Long
 Declare Function gzopen Lib "ZLIB32.DLL"
        (ByVal file As String, ByVal mode As String) As Long
 Declare Function gzread Lib "ZLIB32.DLL"
        (ByVal file As Long, ByVal uncompr As String, ByVal
        uncomprLen As Long) As Long
 Declare Function gzwrite Lib "ZLIB32.DLL"
        (ByVal file As Long, ByVal uncompr As String, ByVal
        uncomprLen As Long) As Long
 Declare Function gzclose Lib "ZLIB32.DLL"
        (ByVal file As Long) As Long
 #End If
 -Jon Caruana
 jon-net@usa.net
 Microsoft Sitebuilder Network Level 1 Member - HTML Writer's Guild Member
--- a/crc32.c
+++ b/crc32.c
@@ -1,9 +1,9 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
-/* $Id: crc32.c,v 1.4 1995/04/14 14:55:12 jloup Exp $ */
+/* @(#) $Id$ */
 #include "zlib.h"
@@ -45,7 +45,7 @@ local void make_crc_table()
  int n, k;
  uLong poly;            /* polynomial exclusive-or pattern */
  /* terms of polynomial defining this crc (except x^32): */
-  static Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+  static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
  /* make exclusive-or pattern from polynomial (0xedb88320L) */
  poly = 0L;
@@ -65,7 +65,7 @@ local void make_crc_table()
 /* ========================================================================
 * Table of CRC-32's of all single-byte values (made by make_crc_table)
 */
-local uLongf crc_table[256] = {
+local const uLongf crc_table[256] = {
  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
  0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
@@ -124,12 +124,12 @@ local uLongf crc_table[256] = {
 /* =========================================================================
 * This function can be used by asm versions of crc32()
 */
-uLongf *get_crc_table()
+const uLongf * ZEXPORT get_crc_table()
 {
 #ifdef DYNAMIC_CRC_TABLE
  if (crc_table_empty) make_crc_table();
 #endif
-  return (uLongf *)crc_table;
+  return (const uLongf *)crc_table;
 }
 /* ========================================================================= */
@@ -139,7 +139,7 @@ uLongf *get_crc_table()
 #define DO8(buf)  DO4(buf); DO4(buf);
 /* ========================================================================= */
-uLong crc32(crc, buf, len)
+uLong ZEXPORT crc32(crc, buf, len)
    uLong crc;
    const Bytef *buf;
    uInt len;
--- a/deflate.c
+++ b/deflate.c
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-1996 Jean-loup Gailly.
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -36,8 +36,8 @@
 *
 *  REFERENCES
 *
- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
+ *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
+ *      Available in ftp://ds.internic.net/rfc/rfc1951.txt
 *
 *      A description of the Rabin and Karp algorithm is given in the book
 *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
@@ -47,11 +47,12 @@
 *
 */
-/* $Id: deflate.c,v 1.8 1995/05/03 17:27:08 jloup Exp $ */
+/* @(#) $Id$ */
 #include "deflate.h"
-char deflate_copyright[] = " deflate 1.0 Copyright 1995-1996 Jean-loup Gailly ";
+const char deflate_copyright[] =
   " deflate 1.1.1 Copyright 1995-1998 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
@@ -62,17 +63,29 @@ char deflate_copyright[] = " deflate 1.0 Copyright 1995-1996 Jean-loup Gailly ";
 /* ===========================================================================
 *  Function prototypes.
 */
 typedef enum {
    need_more,      /* block not completed, need more input or more output */
    block_done,     /* block flush performed */
    finish_started, /* finish started, need only more output at next deflate */
    finish_done     /* finish done, accept no more input or output */
 } block_state;
 typedef block_state (*compress_func) OF((deflate_state *s, int flush));
 /* Compression function. Returns the block state after the call. */
 local void fill_window    OF((deflate_state *s));
-local int  deflate_stored OF((deflate_state *s, int flush));
+local block_state deflate_stored OF((deflate_state *s, int flush));
-local int  deflate_fast   OF((deflate_state *s, int flush));
+local block_state deflate_fast   OF((deflate_state *s, int flush));
-local int  deflate_slow   OF((deflate_state *s, int flush));
+local block_state 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 void flush_pending  OF((z_streamp strm));
-local int read_buf        OF((z_stream *strm, charf *buf, unsigned size));
+local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
 #ifdef ASMV
      void match_init OF((void)); /* asm code initialization */
      uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #else
 local uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #endif
 #ifdef DEBUG
@@ -97,9 +110,6 @@ local  void check_match OF((deflate_state *s, IPos start, IPos match,
 * 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
@@ -113,7 +123,7 @@ typedef struct config_s {
   compress_func func;
 } config;
-local config configuration_table[10] = {
+local const config configuration_table[10] = {
 /*      good lazy nice chain */
 /* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
 /* 1 */ {4,    4,  8,    4, deflate_fast}, /* maximum speed, no lazy matches */
@@ -150,14 +160,23 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
 * 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
 * the previous length of the hash chain.
 * If this file is compiled with -DFASTEST, the compression level is forced
 * to 1, and no hash chains are maintained.
 * IN  assertion: all calls to to INSERT_STRING are made with consecutive
 *    input characters and the first MIN_MATCH bytes of str are valid
 *    (except for the last MIN_MATCH-1 bytes of the input file).
 */
 #ifdef FASTEST
 #define INSERT_STRING(s, str, match_head) \
   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
    match_head = s->head[s->ins_h], \
    s->head[s->ins_h] = (Pos)(str))
 #else
 #define INSERT_STRING(s, str, match_head) \
   (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))
+    s->head[s->ins_h] = (Pos)(str))
 #endif
 /* ===========================================================================
 * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
@@ -165,11 +184,11 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
 */
 #define CLEAR_HASH(s) \
    s->head[s->hash_size-1] = NIL; \
-    zmemzero((charf *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
 /* ========================================================================= */
-int deflateInit_(strm, level, version, stream_size)
+int ZEXPORT deflateInit_(strm, level, version, stream_size)
-    z_stream *strm;
+    z_streamp strm;
    int level;
    const char *version;
    int stream_size;
@@ -180,9 +199,9 @@ int deflateInit_(strm, level, version, stream_size)
 }
 /* ========================================================================= */
-int deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 		  version, stream_size)
-    z_stream *strm;
+    z_streamp strm;
    int  level;
    int  method;
    int  windowBits;
@@ -193,8 +212,14 @@ int deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 {
    deflate_state *s;
    int noheader = 0;
    static const char* my_version = ZLIB_VERSION;
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+    ushf *overlay;
    /* We overlay pending_buf and d_buf+l_buf. This works since the average
     * output size for (length,distance) codes is <= 24 bits.
     */
    if (version == Z_NULL || version[0] != my_version[0] ||
        stream_size != sizeof(z_stream)) {
 	return Z_VERSION_ERROR;
    }
@@ -208,6 +233,9 @@ int deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
    if (strm->zfree == Z_NULL) strm->zfree = zcfree;
    if (level == Z_DEFAULT_COMPRESSION) level = 6;
 #ifdef FASTEST
    level = 1;
 #endif
    if (windowBits < 0) { /* undocumented feature: suppress zlib header */
        noheader = 1;
@@ -239,20 +267,18 @@ int deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 2*sizeof(ush));
+    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
    s->pending_buf = (uchf *) overlay;
    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
        s->pending_buf == Z_NULL) {
-        strm->msg = ERR_MSG(Z_MEM_ERROR);
+        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
        deflateEnd (strm);
        return Z_MEM_ERROR;
    }
-    s->l_buf = (uchf *) &(s->pending_buf[s->lit_bufsize]);
+    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->d_buf = (ushf *) &(s->pending_buf[2*s->lit_bufsize]);
+    s->l_buf = s->pending_buf + (1+sizeof(ush))*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). d_buf is put last in case sizeof(short)>2.
     */
    s->level = level;
    s->strategy = strategy;
@@ -262,15 +288,15 @@ int deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 }
 /* ========================================================================= */
-int deflateSetDictionary (strm, dictionary, dictLength)
+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-    z_stream *strm;
+    z_streamp strm;
    const Bytef *dictionary;
    uInt  dictLength;
 {
    deflate_state *s;
    uInt length = dictLength;
    uInt n;
-    IPos hash_head;
+    IPos hash_head = 0;
    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
        strm->state->status != INIT_STATE) return Z_STREAM_ERROR;
@@ -281,9 +307,11 @@ int deflateSetDictionary (strm, dictionary, dictLength)
    if (length < MIN_MATCH) return Z_OK;
    if (length > MAX_DIST(s)) {
 	length = MAX_DIST(s);
-	dictionary += dictLength - length;
+#ifndef USE_DICT_HEAD
 	dictionary += dictLength - length; /* use the tail of the dictionary */
 #endif
    }
-    zmemcpy((charf *)s->window, dictionary, length);
+    zmemcpy(s->window, dictionary, length);
    s->strstart = length;
    s->block_start = (long)length;
@@ -296,12 +324,13 @@ int deflateSetDictionary (strm, dictionary, dictLength)
    for (n = 0; n <= length - MIN_MATCH; n++) {
 	INSERT_STRING(s, n, hash_head);
    }
    if (hash_head) hash_head = 0;  /* to make compiler happy */
    return Z_OK;
 }
 /* ========================================================================= */
-int deflateReset (strm)
+int ZEXPORT deflateReset (strm)
-    z_stream *strm;
+    z_streamp strm;
 {
    deflate_state *s;
@@ -330,13 +359,14 @@ int deflateReset (strm)
 }
 /* ========================================================================= */
-int deflateParams(strm, level, strategy)
+int ZEXPORT deflateParams(strm, level, strategy)
-    z_stream *strm;
+    z_streamp strm;
    int level;
    int strategy;
 {
    deflate_state *s;
    compress_func func;
    int err = Z_OK;
    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
    s = strm->state;
@@ -349,11 +379,9 @@ int deflateParams(strm, level, strategy)
    }
    func = configuration_table[s->level].func;
-    if (func != configuration_table[level].func
+    if (func != configuration_table[level].func && strm->total_in != 0) {
 	&& strm->state->lookahead != 0) {
 	/* Flush the last buffer: */
-	(void)(*func)(strm->state, Z_PARTIAL_FLUSH);
+	err = deflate(strm, Z_PARTIAL_FLUSH);
    }
    if (s->level != level) {
 	s->level = level;
@@ -363,7 +391,7 @@ int deflateParams(strm, level, strategy)
 	s->max_chain_length = configuration_table[level].max_chain;
    }
    s->strategy = strategy;
-    return Z_OK;
+    return err;
 }
 /* =========================================================================
@@ -386,7 +414,7 @@ local void putShortMSB (s, b)
 * (See also read_buf()).
 */
 local void flush_pending(strm)
-    z_stream *strm;
+    z_streamp strm;
 {
    unsigned len = strm->state->pending;
@@ -405,15 +433,17 @@ local void flush_pending(strm)
 }
 /* ========================================================================= */
-int deflate (strm, flush)
+int ZEXPORT deflate (strm, flush)
-    z_stream *strm;
+    z_streamp strm;
    int flush;
 {
    int old_flush; /* value of flush param for previous deflate call */
    deflate_state *s;
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (strm == Z_NULL || strm->state == Z_NULL ||
-    
+	flush > Z_FINISH || flush < 0) {
        return Z_STREAM_ERROR;
    }
    s = strm->state;
    if (strm->next_out == Z_NULL ||
@@ -445,14 +475,23 @@ int deflate (strm, flush)
 	if (s->strstart != 0) {
 	    putShortMSB(s, (uInt)(strm->adler >> 16));
 	    putShortMSB(s, (uInt)(strm->adler & 0xffff));
 	    strm->adler = 1L;
 	}
 	strm->adler = 1L;
    }
    /* Flush as much pending output as possible */
    if (s->pending != 0) {
        flush_pending(strm);
-        if (strm->avail_out == 0) return Z_OK;
+        if (strm->avail_out == 0) {
 	    /* Since avail_out is 0, deflate will be called again with
 	     * more output space, but possibly with both pending and
 	     * avail_in equal to zero. There won't be anything to do,
 	     * but this is not an error situation so make sure we
 	     * return OK instead of BUF_ERROR at next call of deflate:
             */
 	    s->last_flush = -1;
 	    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
@@ -472,22 +511,27 @@ int deflate (strm, flush)
     */
    if (strm->avail_in != 0 || s->lookahead != 0 ||
        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-        int quit;
+        block_state bstate;
-        if (flush == Z_FINISH) {
+	bstate = (*(configuration_table[s->level].func))(s, flush);
        if (bstate == finish_started || bstate == finish_done) {
            s->status = FINISH_STATE;
        }
-	quit = (*(configuration_table[s->level].func))(s, flush);
+        if (bstate == need_more || bstate == finish_started) {
-
+	    if (strm->avail_out == 0) {
-        if (quit || strm->avail_out == 0) return Z_OK;
+	        s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-        /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+	    }
-         * of deflate should use the same flush parameter to make sure
+	    return Z_OK;
-         * that the flush is complete. So we don't have to output an
+	    /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-         * empty block here, this will be done at next call. This also
+	     * of deflate should use the same flush parameter to make sure
-         * ensures that for a very small output buffer, we emit at most
+	     * that the flush is complete. So we don't have to output an
-         * one empty block.
+	     * empty block here, this will be done at next call. This also
-         */
+	     * ensures that for a very small output buffer, we emit at most
-        if (flush != Z_NO_FLUSH && flush != Z_FINISH) {
+	     * one empty block.
 	     */
 	}
        if (bstate == block_done) {
            if (flush == Z_PARTIAL_FLUSH) {
                _tr_align(s);
            } else { /* FULL_FLUSH or SYNC_FLUSH */
@@ -500,7 +544,10 @@ int deflate (strm, flush)
                }
            }
            flush_pending(strm);
-            if (strm->avail_out == 0) return Z_OK;
+	    if (strm->avail_out == 0) {
 	      s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
 	      return Z_OK;
 	    }
        }
    }
    Assert(strm->avail_out > 0, "bug2");
@@ -520,42 +567,85 @@ int deflate (strm, flush)
 }
 /* ========================================================================= */
-int deflateEnd (strm)
+int ZEXPORT deflateEnd (strm)
-    z_stream *strm;
+    z_streamp strm;
 {
    int status;
    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
    status = strm->state->status;
    if (status != INIT_STATE && status != BUSY_STATE &&
 	status != FINISH_STATE) {
      return Z_STREAM_ERROR;
    }
    /* 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);
    status = strm->state->status;
    ZFREE(strm, strm->state);
    strm->state = Z_NULL;
    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
 }
-/* ========================================================================= */
+/* =========================================================================
-int deflateCopy (dest, source)
+ * Copy the source state to the destination state.
-    z_stream *dest;
+ * To simplify the source, this is not supported for 16-bit MSDOS (which
-    z_stream *source;
+ * doesn't have enough memory anyway to duplicate compression states).
 */
 int ZEXPORT deflateCopy (dest, source)
    z_streamp dest;
    z_streamp source;
 {
-    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
+#ifdef MAXSEG_64K
    return Z_STREAM_ERROR;
 #else
    deflate_state *ds;
    deflate_state *ss;
    ushf *overlay;
    ss = source->state;
    if (source == Z_NULL || dest == Z_NULL || ss == Z_NULL) {
        return Z_STREAM_ERROR;
    }
    *dest = *source;
    return Z_STREAM_ERROR; /* to be implemented */
 #if 0
    dest->state = (struct internal_state FAR *)
        (*dest->zalloc)(1, sizeof(deflate_state));
    if (dest->state == Z_NULL) return Z_MEM_ERROR;
-    *(dest->state) = *(source->state);
+    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
    if (ds == Z_NULL) return Z_MEM_ERROR;
    dest->state = (struct internal_state FAR *) ds;
    *ds = *ss;
    ds->strm = dest;
    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
    ds->pending_buf = (uchf *) overlay;
    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
        ds->pending_buf == Z_NULL) {
        deflateEnd (dest);
        return Z_MEM_ERROR;
    }
    /* following zmemcpy do not work for 16-bit MSDOS */
    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
    ds->l_desc.dyn_tree = ds->dyn_ltree;
    ds->d_desc.dyn_tree = ds->dyn_dtree;
    ds->bl_desc.dyn_tree = ds->bl_tree;
    return Z_OK;
 #endif
 }
@@ -568,8 +658,8 @@ int deflateCopy (dest, source)
 * (See also flush_pending()).
 */
 local int read_buf(strm, buf, size)
-    z_stream *strm;
+    z_streamp strm;
-    charf *buf;
+    Bytef *buf;
    unsigned size;
 {
    unsigned len = strm->avail_in;
@@ -630,7 +720,8 @@ 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 int longest_match(s, cur_match)
+#ifndef FASTEST
 local uInt longest_match(s, cur_match)
    deflate_state *s;
    IPos cur_match;                             /* current match */
 {
@@ -673,7 +764,7 @@ local int longest_match(s, cur_match)
    /* Do not look for matches beyond the end of the input. This is necessary
     * to make deflate deterministic.
     */
-    if (nice_match > s->lookahead) nice_match = s->lookahead;
+    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
@@ -764,9 +855,67 @@ local int longest_match(s, cur_match)
    } while ((cur_match = prev[cur_match & wmask]) > limit
             && --chain_length != 0);
-    if (best_len <= s->lookahead) return best_len;
+    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
    return s->lookahead;
 }
 #else /* FASTEST */
 /* ---------------------------------------------------------------------------
 * Optimized version for level == 1 only
 */
 local uInt longest_match(s, cur_match)
    deflate_state *s;
    IPos cur_match;                             /* current match */
 {
    register Bytef *scan = s->window + s->strstart; /* current string */
    register Bytef *match;                       /* matched string */
    register int len;                           /* length of current match */
    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
     * It is easy to get rid of this optimization if necessary.
     */
    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
    Assert(cur_match < s->strstart, "no future");
    match = s->window + cur_match;
    /* Return failure if the match length is less than 2:
     */
    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
    /* The check at best_len-1 can be removed because it will be made
     * again later. (This heuristic is not always a win.)
     * 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 are equal and that HASH_BITS >= 8.
     */
    scan += 2, match += 2;
    Assert(*scan == *match, "match[2]?");
    /* We check for insufficient lookahead only every 8th comparison;
     * the 256th check will be made at strstart+258.
     */
    do {
    } while (*++scan == *++match && *++scan == *++match &&
 	     *++scan == *++match && *++scan == *++match &&
 	     *++scan == *++match && *++scan == *++match &&
 	     *++scan == *++match && *++scan == *++match &&
 	     scan < strend);
    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
    len = MAX_MATCH - (int)(strend - scan);
    if (len < MIN_MATCH) return MIN_MATCH - 1;
    s->match_start = cur_match;
    return len <= s->lookahead ? len : s->lookahead;
 }
 #endif /* FASTEST */
 #endif /* ASMV */
 #ifdef DEBUG
@@ -779,8 +928,8 @@ local void check_match(s, start, match, length)
    int length;
 {
    /* check that the match is indeed a match */
-    if (zmemcmp((charf *)s->window + match,
+    if (zmemcmp(s->window + match,
-                (charf *)s->window + start, length) != EQUAL) {
+                s->window + start, length) != EQUAL) {
        fprintf(stderr, " start %u, match %u, length %d\n",
 		start, match, length);
        do {
@@ -788,7 +937,7 @@ local void check_match(s, start, match, length)
 	} while (--length != 0);
        z_error("invalid match");
    }
-    if (verbose > 1) {
+    if (z_verbose > 1) {
        fprintf(stderr,"\\[%d,%d]", start-match, length);
        do { putc(s->window[start++], stderr); } while (--length != 0);
    }
@@ -833,33 +982,35 @@ local void fill_window(s)
         */
        } else if (s->strstart >= wsize+MAX_DIST(s)) {
-            zmemcpy((charf *)s->window, (charf *)s->window+wsize,
+            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
                   (unsigned)wsize);
            s->match_start -= wsize;
            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
            s->block_start -= (long) wsize;
            /* Slide the hash table (could be avoided with 32 bit values
-               at the expense of memory usage):
+               at the expense of memory usage). We slide even when level == 0
               to keep the hash table consistent if we switch back to level > 0
               later. (Using level 0 permanently is not an optimal usage of
               zlib, so we don't care about this pathological case.)
             */
-            n = s->hash_size;
+	    n = s->hash_size;
-            p = &s->head[n];
+	    p = &s->head[n];
-            do {
+	    do {
-                m = *--p;
+		m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+		*p = (Pos)(m >= wsize ? m-wsize : NIL);
-            } while (--n);
+	    } while (--n);
            n = wsize;
            p = &s->prev[n];
            do {
                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.
                 */
            } while (--n);
 	    n = wsize;
 #ifndef FASTEST
 	    p = &s->prev[n];
 	    do {
 		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.
 		 */
 	    } while (--n);
 #endif
            more += wsize;
        }
        if (s->strm->avail_in == 0) return;
@@ -877,8 +1028,7 @@ local void fill_window(s)
         */
        Assert(more >= 2, "more < 2");
-        n = read_buf(s->strm, (charf *)s->window + s->strstart + s->lookahead,
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
                     more);
        s->lookahead += n;
        /* Initialize the hash value now that we have some input: */
@@ -914,21 +1064,33 @@ local void fill_window(s)
 /* Same but force premature exit if necessary. */
 #define FLUSH_BLOCK(s, eof) { \
   FLUSH_BLOCK_ONLY(s, eof); \
-   if (s->strm->avail_out == 0) return 1; \
+   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
 }
 /* ===========================================================================
 * Copy without compression as much as possible from the input stream, return
- * true if processing was terminated prematurely (no more input or output
+ * the current block state.
- * space).  This function does not insert new strings in the dictionary
+ * This function does not insert new strings in the dictionary since
- * since uncompressible data is probably not useful. This function is used
+ * 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.
+ * NOTE: this function should be optimized to avoid extra copying from
 * window to pending_buf.
 */
-local int deflate_stored(s, flush)
+local block_state deflate_stored(s, flush)
    deflate_state *s;
    int flush;
 {
    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
     * to pending_buf_size, and each stored block has a 5 byte header:
     */
    ulg max_block_size = 0xffff;
    ulg max_start;
    if (max_block_size > s->pending_buf_size - 5) {
        max_block_size = s->pending_buf_size - 5;
    }
    /* Copy as much as possible from input to output: */
    for (;;) {
        /* Fill the window as much as possible: */
        if (s->lookahead <= 1) {
@@ -937,7 +1099,7 @@ local int deflate_stored(s, flush)
 		   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 && flush == Z_NO_FLUSH) return need_more;
            if (s->lookahead == 0) break; /* flush the current block */
        }
@@ -946,30 +1108,33 @@ local int deflate_stored(s, flush)
 	s->strstart += s->lookahead;
 	s->lookahead = 0;
-        /* Stored blocks are limited to 0xffff bytes: */
+	/* Emit a stored block if pending_buf will be full: */
-        if (s->strstart == 0 || s->strstart > 0xffff) {
+ 	max_start = s->block_start + max_block_size;
        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
 	    /* strstart == 0 is possible when wraparound on 16-bit machine */
-	    s->lookahead = s->strstart - 0xffff;
+	    s->lookahead = (uInt)(s->strstart - max_start);
-	    s->strstart = 0xffff;
+	    s->strstart = (uInt)max_start;
            FLUSH_BLOCK(s, 0);
 	}
-
+	/* Flush if we may have to slide, otherwise block_start may become
-	/* Emit a stored block if it is large enough: */
+         * negative and the data will be gone:
         */
        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
            FLUSH_BLOCK(s, 0);
 	}
    }
    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return 0; /* normal exit */
+    return flush == Z_FINISH ? finish_done : block_done;
 }
 /* ===========================================================================
- * Compress as much as possible from the input stream, return true if
+ * Compress as much as possible from the input stream, return the current
- * processing was terminated prematurely (no more input or output space).
+ * block state.
 * 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.
 */
-local int deflate_fast(s, flush)
+local block_state deflate_fast(s, flush)
    deflate_state *s;
    int flush;
 {
@@ -984,8 +1149,9 @@ local int deflate_fast(s, flush)
         */
        if (s->lookahead < MIN_LOOKAHEAD) {
            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) return 1;
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-
+	        return need_more;
 	    }
            if (s->lookahead == 0) break; /* flush the current block */
        }
@@ -1012,14 +1178,15 @@ local int deflate_fast(s, flush)
        if (s->match_length >= MIN_MATCH) {
            check_match(s, s->strstart, s->match_start, s->match_length);
-            bflush = _tr_tally(s, s->strstart - s->match_start,
+            _tr_tally_dist(s, s->strstart - s->match_start,
-                               s->match_length - MIN_MATCH);
+                           s->match_length - MIN_MATCH, bflush);
            s->lookahead -= s->match_length;
            /* Insert new strings in the hash table only if the match length
             * is not too large. This saves time but degrades compression.
             */
 #ifndef FASTEST
            if (s->match_length <= s->max_insert_length &&
                s->lookahead >= MIN_MATCH) {
                s->match_length--; /* string at strstart already in hash table */
@@ -1031,7 +1198,9 @@ local int deflate_fast(s, flush)
                     */
                } while (--s->match_length != 0);
                s->strstart++; 
-            } else {
+            } else
 #endif
 	    {
                s->strstart += s->match_length;
                s->match_length = 0;
                s->ins_h = s->window[s->strstart];
@@ -1046,14 +1215,14 @@ local int deflate_fast(s, flush)
        } else {
            /* No match, output a literal byte */
            Tracevv((stderr,"%c", s->window[s->strstart]));
-            bflush = _tr_tally (s, 0, s->window[s->strstart]);
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
            s->lookahead--;
            s->strstart++; 
        }
        if (bflush) FLUSH_BLOCK(s, 0);
    }
    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return 0; /* normal exit */
+    return flush == Z_FINISH ? finish_done : block_done;
 }
 /* ===========================================================================
@@ -1061,7 +1230,7 @@ local int deflate_fast(s, flush)
 * evaluation for matches: a match is finally adopted only if there is
 * no better match at the next window position.
 */
-local int deflate_slow(s, flush)
+local block_state deflate_slow(s, flush)
    deflate_state *s;
    int flush;
 {
@@ -1077,8 +1246,9 @@ local int deflate_slow(s, flush)
         */
        if (s->lookahead < MIN_LOOKAHEAD) {
            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) return 1;
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-
+	        return need_more;
 	    }
            if (s->lookahead == 0) break; /* flush the current block */
        }
@@ -1124,8 +1294,8 @@ local int deflate_slow(s, flush)
            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-            bflush = _tr_tally(s, s->strstart -1 - s->prev_match,
+            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
-                               s->prev_length - MIN_MATCH);
+			   s->prev_length - MIN_MATCH, bflush);
            /* Insert in hash table all strings up to the end of the match.
             * strstart-1 and strstart are already inserted. If there is not
@@ -1151,12 +1321,13 @@ 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 (_tr_tally (s, 0, s->window[s->strstart-1])) {
+	    _tr_tally_lit(s, s->window[s->strstart-1], bflush);
 	    if (bflush) {
                FLUSH_BLOCK_ONLY(s, 0);
            }
            s->strstart++;
            s->lookahead--;
-            if (s->strm->avail_out == 0) return 1;
+            if (s->strm->avail_out == 0) return need_more;
        } else {
            /* There is no previous match to compare with, wait for
             * the next step to decide.
@@ -1169,10 +1340,9 @@ local int deflate_slow(s, flush)
    Assert (flush != Z_NO_FLUSH, "no flush?");
    if (s->match_available) {
        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally (s, 0, s->window[s->strstart-1]);
+        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
        s->match_available = 0;
    }
    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return 0;
+    return flush == Z_FINISH ? finish_done : block_done;
 }
--- a/deflate.h
+++ b/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-1996 Jean-loup Gailly
+ * Copyright (C) 1995-1998 Jean-loup Gailly
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -8,7 +8,7 @@
   subject to change. Applications should only use zlib.h.
 */
-/* $Id: deflate.h,v 1.5 1995/05/03 17:27:09 jloup Exp $ */
+/* @(#) $Id$ */
 #ifndef _DEFLATE_H
 #define _DEFLATE_H
@@ -80,9 +80,10 @@ typedef unsigned IPos;
 */
 typedef struct internal_state {
-    z_stream *strm;      /* pointer back to this zlib stream */
+    z_streamp strm;      /* pointer back to this zlib stream */
    int   status;        /* as the name implies */
    Bytef *pending_buf;  /* output still pending */
    ulg   pending_buf_size; /* size of pending_buf */
    Bytef *pending_out;  /* next pending byte to output to the stream */
    int   pending;       /* nb of bytes in the pending buffer */
    int   noheader;      /* suppress zlib header and adler32 */
@@ -272,4 +273,46 @@ ulg  _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
 void _tr_align        OF((deflate_state *s));
 void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
                          int eof));
 #define d_code(dist) \
   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
 /* Mapping from a distance to a distance code. dist is the distance - 1 and
 * must not have side effects. _dist_code[256] and _dist_code[257] are never
 * used.
 */
 #ifndef DEBUG
 /* Inline versions of _tr_tally for speed: */
 #if defined(GEN_TREES_H) || !defined(STDC)
  extern uch _length_code[];
  extern uch _dist_code[];
 #else
  extern const uch _length_code[];
  extern const uch _dist_code[];
 #endif
 # define _tr_tally_lit(s, c, flush) \
  { uch cc = (c); \
    s->d_buf[s->last_lit] = 0; \
    s->l_buf[s->last_lit++] = cc; \
    s->dyn_ltree[cc].Freq++; \
    flush = (s->last_lit == s->lit_bufsize-1); \
   }
 # define _tr_tally_dist(s, distance, length, flush) \
  { uch len = (length); \
    ush dist = (distance); \
    s->d_buf[s->last_lit] = dist; \
    s->l_buf[s->last_lit++] = len; \
    dist--; \
    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
    s->dyn_dtree[d_code(dist)].Freq++; \
    flush = (s->last_lit == s->lit_bufsize-1); \
  }
 #else
 # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
 # define _tr_tally_dist(s, distance, length, flush) \
              flush = _tr_tally(s, distance, length) 
 #endif
 #endif
--- a/example.c
+++ b/example.c
@@ -1,9 +1,9 @@
 /* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995-1996 Jean-loup Gailly.
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
-/* $Id: example.c,v 1.9 1995/05/03 17:27:09 jloup Exp $ */
+/* @(#) $Id$ */
 #include <stdio.h>
 #include "zlib.h"
@@ -30,30 +30,30 @@ const char hello[] = "hello, hello!";
 const char dictionary[] = "hello";
 uLong dictId; /* Adler32 value of the dictionary */
-void test_compress      OF((Bytef *compr, uLong comprLen,
+void test_compress      OF((Byte *compr, uLong comprLen,
-		            Bytef *uncompr, uLong uncomprLen));
+		            Byte *uncompr, uLong uncomprLen));
 void test_gzio          OF((const char *out, const char *in, 
-		            Bytef *uncompr, int uncomprLen));
+		            Byte *uncompr, int uncomprLen));
-void test_deflate       OF((Bytef *compr, uLong comprLen));
+void test_deflate       OF((Byte *compr, uLong comprLen));
-void test_inflate       OF((Bytef *compr, uLong comprLen,
+void test_inflate       OF((Byte *compr, uLong comprLen,
-		            Bytef *uncompr, uLong uncomprLen));
+		            Byte *uncompr, uLong uncomprLen));
-void test_large_deflate OF((Bytef *compr, uLong comprLen,
+void test_large_deflate OF((Byte *compr, uLong comprLen,
-		            Bytef *uncompr, uLong uncomprLen));
+		            Byte *uncompr, uLong uncomprLen));
-void test_large_inflate OF((Bytef *compr, uLong comprLen,
+void test_large_inflate OF((Byte *compr, uLong comprLen,
-		            Bytef *uncompr, uLong uncomprLen));
+		            Byte *uncompr, uLong uncomprLen));
-void test_flush         OF((Bytef *compr, uLong comprLen));
+void test_flush         OF((Byte *compr, uLong *comprLen));
-void test_sync          OF((Bytef *compr, uLong comprLen,
+void test_sync          OF((Byte *compr, uLong comprLen,
-		            Bytef *uncompr, uLong uncomprLen));
+		            Byte *uncompr, uLong uncomprLen));
-void test_dict_deflate  OF((Bytef *compr, uLong comprLen));
+void test_dict_deflate  OF((Byte *compr, uLong comprLen));
-void test_dict_inflate  OF((Bytef *compr, uLong comprLen,
+void test_dict_inflate  OF((Byte *compr, uLong comprLen,
-		            Bytef *uncompr, uLong uncomprLen));
+		            Byte *uncompr, uLong uncomprLen));
 int  main               OF((int argc, char *argv[]));
 /* ===========================================================================
 * Test compress() and uncompress()
 */
 void test_compress(compr, comprLen, uncompr, uncomprLen)
-    Bytef *compr, *uncompr;
+    Byte *compr, *uncompr;
    uLong comprLen, uncomprLen;
 {
    int err;
@@ -69,6 +69,7 @@ void test_compress(compr, comprLen, uncompr, uncomprLen)
    if (strcmp((char*)uncompr, hello)) {
        fprintf(stderr, "bad uncompress\n");
 	exit(1);
    } else {
        printf("uncompress(): %s\n", uncompr);
    }
@@ -80,22 +81,29 @@ void test_compress(compr, comprLen, uncompr, uncomprLen)
 void test_gzio(out, in, uncompr, uncomprLen)
    const char *out; /* output file */
    const char *in;  /* input file */
-    Bytef *uncompr;
+    Byte *uncompr;
    int  uncomprLen;
 {
    int err;
    int len = strlen(hello)+1;
    gzFile file;
    z_off_t pos;
    file = gzopen(out, "wb");
    if (file == NULL) {
        fprintf(stderr, "gzopen error\n");
        exit(1);
    }
-
+    gzputc(file, 'h');
-    if (gzwrite(file, (const voidp)hello, (unsigned)len) != len) {
+    if (gzputs(file, "ello") != 4) {
-        fprintf(stderr, "gzwrite err: %s\n", gzerror(file, &err));
+        fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
 	exit(1);
    }
    if (gzprintf(file, ", %s!", "hello") != 8) {
        fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
 	exit(1);
    }
    gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
    gzclose(file);
    file = gzopen(in, "rb");
@@ -107,21 +115,48 @@ void test_gzio(out, in, uncompr, uncomprLen)
    uncomprLen = gzread(file, uncompr, (unsigned)uncomprLen);
    if (uncomprLen != len) {
        fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
 	exit(1);
    }
    gzclose(file);
    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad gzread\n");
+        fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
 	exit(1);
    } else {
        printf("gzread(): %s\n", uncompr);
    }
    pos = gzseek(file, -8L, SEEK_CUR);
    if (pos != 6 || gztell(file) != pos) {
 	fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
 		pos, gztell(file));
 	exit(1);
    }
    if (gzgetc(file) != ' ') {
 	fprintf(stderr, "gzgetc error\n");
 	exit(1);
    }
    gzgets(file, (char*)uncompr, uncomprLen);
    uncomprLen = strlen((char*)uncompr);
    if (uncomprLen != 6) { /* "hello!" */
        fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
 	exit(1);
    }
    if (strcmp((char*)uncompr, hello+7)) {
        fprintf(stderr, "bad gzgets after gzseek\n");
 	exit(1);
    } else {
        printf("gzgets() after gzseek: %s\n", uncompr);
    }
    gzclose(file);
 }
 /* ===========================================================================
 * Test deflate() with small buffers
 */
 void test_deflate(compr, comprLen)
-    Bytef *compr;
+    Byte *compr;
    uLong comprLen;
 {
    z_stream c_stream; /* compression stream */
@@ -159,7 +194,7 @@ void test_deflate(compr, comprLen)
 * Test inflate() with small buffers
 */
 void test_inflate(compr, comprLen, uncompr, uncomprLen)
-    Bytef *compr, *uncompr;
+    Byte *compr, *uncompr;
    uLong comprLen, uncomprLen;
 {
    int err;
@@ -171,12 +206,13 @@ void test_inflate(compr, comprLen, uncompr, uncomprLen)
    d_stream.zfree = (free_func)0;
    d_stream.opaque = (voidpf)0;
    d_stream.next_in  = compr;
    d_stream.avail_in = 0;
    d_stream.next_out = uncompr;
    err = inflateInit(&d_stream);
    CHECK_ERR(err, "inflateInit");
    d_stream.next_in  = compr;
    d_stream.next_out = uncompr;
    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
        err = inflate(&d_stream, Z_NO_FLUSH);
@@ -189,6 +225,7 @@ void test_inflate(compr, comprLen, uncompr, uncomprLen)
    if (strcmp((char*)uncompr, hello)) {
        fprintf(stderr, "bad inflate\n");
 	exit(1);
    } else {
        printf("inflate(): %s\n", uncompr);
    }
@@ -198,7 +235,7 @@ void test_inflate(compr, comprLen, uncompr, uncomprLen)
 * Test deflate() with large buffers and dynamic change of compression level
 */
 void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
-    Bytef *compr, *uncompr;
+    Byte *compr, *uncompr;
    uLong comprLen, uncomprLen;
 {
    z_stream c_stream; /* compression stream */
@@ -223,6 +260,7 @@ void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
    CHECK_ERR(err, "deflate");
    if (c_stream.avail_in != 0) {
        fprintf(stderr, "deflate not greedy\n");
 	exit(1);
    }
    /* Feed in already compressed data and switch to no compression: */
@@ -242,6 +280,7 @@ void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
    err = deflate(&c_stream, Z_FINISH);
    if (err != Z_STREAM_END) {
        fprintf(stderr, "deflate should report Z_STREAM_END\n");
 	exit(1);
    }
    err = deflateEnd(&c_stream);
    CHECK_ERR(err, "deflateEnd");
@@ -251,7 +290,7 @@ void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
 * Test inflate() with large buffers
 */
 void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
-    Bytef *compr, *uncompr;
+    Byte *compr, *uncompr;
    uLong comprLen, uncomprLen;
 {
    int err;
@@ -263,12 +302,12 @@ void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
    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;
    err = inflateInit(&d_stream);
    CHECK_ERR(err, "inflateInit");
    for (;;) {
        d_stream.next_out = uncompr;            /* discard the output */
 	d_stream.avail_out = (uInt)uncomprLen;
@@ -282,6 +321,7 @@ void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
 	exit(1);
    } else {
        printf("large_inflate(): OK\n");
    }
@@ -291,8 +331,8 @@ void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
 * Test deflate() with full flush
 */
 void test_flush(compr, comprLen)
-    Bytef *compr;
+    Byte *compr;
-    uLong comprLen;
+    uLong *comprLen;
 {
    z_stream c_stream; /* compression stream */
    int err;
@@ -308,7 +348,7 @@ void test_flush(compr, comprLen)
    c_stream.next_in  = (Bytef*)hello;
    c_stream.next_out = compr;
    c_stream.avail_in = 3;
-    c_stream.avail_out = (uInt)comprLen;
+    c_stream.avail_out = (uInt)*comprLen;
    err = deflate(&c_stream, Z_FULL_FLUSH);
    CHECK_ERR(err, "deflate");
@@ -321,13 +361,15 @@ void test_flush(compr, comprLen)
    }
    err = deflateEnd(&c_stream);
    CHECK_ERR(err, "deflateEnd");
    *comprLen = c_stream.total_out;
 }
 /* ===========================================================================
 * Test inflateSync()
 */
 void test_sync(compr, comprLen, uncompr, uncomprLen)
-    Bytef *compr, *uncompr;
+    Byte *compr, *uncompr;
    uLong comprLen, uncomprLen;
 {
    int err;
@@ -339,12 +381,13 @@ void test_sync(compr, comprLen, uncompr, uncomprLen)
    d_stream.zfree = (free_func)0;
    d_stream.opaque = (voidpf)0;
    d_stream.next_in  = compr;
    d_stream.avail_in = 2; /* just read the zlib header */
    err = inflateInit(&d_stream);
    CHECK_ERR(err, "inflateInit");
    d_stream.next_in  = compr;
    d_stream.next_out = uncompr;
    d_stream.avail_in = 2; /* just read the zlib header */
    d_stream.avail_out = (uInt)uncomprLen;
    inflate(&d_stream, Z_NO_FLUSH);
@@ -358,6 +401,7 @@ void test_sync(compr, comprLen, uncompr, uncomprLen)
    if (err != Z_DATA_ERROR) {
        fprintf(stderr, "inflate should report DATA_ERROR\n");
        /* Because of incorrect adler32 */
 	exit(1);
    }
    err = inflateEnd(&d_stream);
    CHECK_ERR(err, "inflateEnd");
@@ -369,7 +413,7 @@ void test_sync(compr, comprLen, uncompr, uncomprLen)
 * Test deflate() with preset dictionary
 */
 void test_dict_deflate(compr, comprLen)
-    Bytef *compr;
+    Byte *compr;
    uLong comprLen;
 {
    z_stream c_stream; /* compression stream */
@@ -396,6 +440,7 @@ void test_dict_deflate(compr, comprLen)
    err = deflate(&c_stream, Z_FINISH);
    if (err != Z_STREAM_END) {
        fprintf(stderr, "deflate should report Z_STREAM_END\n");
 	exit(1);
    }
    err = deflateEnd(&c_stream);
    CHECK_ERR(err, "deflateEnd");
@@ -405,7 +450,7 @@ void test_dict_deflate(compr, comprLen)
 * Test inflate() with a preset dictionary
 */
 void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
-    Bytef *compr, *uncompr;
+    Byte *compr, *uncompr;
    uLong comprLen, uncomprLen;
 {
    int err;
@@ -417,12 +462,12 @@ void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
    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;
    err = inflateInit(&d_stream);
    CHECK_ERR(err, "inflateInit");
    d_stream.next_out = uncompr;
    d_stream.avail_out = (uInt)uncomprLen;
@@ -445,6 +490,7 @@ void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
    if (strcmp((char*)uncompr, hello)) {
        fprintf(stderr, "bad inflate with dict\n");
 	exit(1);
    } else {
        printf("inflate with dictionary: %s\n", uncompr);
    }
@@ -458,25 +504,28 @@ int main(argc, argv)
    int argc;
    char *argv[];
 {
-    Bytef *compr, *uncompr;
+    Byte *compr, *uncompr;
-    uLong comprLen = 32750*sizeof(int); /* don't overflow on MSDOS */
+    uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
    uLong uncomprLen = comprLen;
    static const char* myVersion = ZLIB_VERSION;
-    if (zlib_version[0] != ZLIB_VERSION[0]) {
+    if (zlibVersion()[0] != myVersion[0]) {
        fprintf(stderr, "incompatible zlib version\n");
        exit(1);
-    } else if (strcmp(zlib_version, ZLIB_VERSION) != 0) {
+    } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
        fprintf(stderr, "warning: different zlib version\n");
    }
-    compr    = (Bytef*)malloc((uInt)comprLen);
+    compr    = (Byte*)calloc((uInt)comprLen, 1);
-    uncompr  = (Bytef*)calloc((uInt)uncomprLen, 1); /* must be cleared */
+    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1);
    /* compr and uncompr are cleared to avoid reading uninitialized
     * data and to ensure that uncompr compresses well.
     */
    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"),
@@ -489,8 +538,9 @@ int main(argc, argv)
    test_large_deflate(compr, comprLen, uncompr, uncomprLen);
    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
-    test_flush(compr, comprLen);
+    test_flush(compr, &comprLen);
    test_sync(compr, comprLen, uncompr, uncomprLen);
    comprLen = uncomprLen;
    test_dict_deflate(compr, comprLen);
    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
--- a/gzio.c
+++ b/gzio.c
@@ -1,9 +1,11 @@
 /* gzio.c -- IO on .gz files
- * Copyright (C) 1995-1996 Jean-loup Gailly.
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h
 *
 * Compile this file with -DNO_DEFLATE to avoid the compression code.
 */
-/* $Id: gzio.c,v 1.8 1995/05/03 17:27:09 jloup Exp $ */
+/* @(#) $Id$ */
 #include <stdio.h>
@@ -11,7 +13,8 @@
 struct internal_state {int dummy;}; /* for buggy compilers */
-#define Z_BUFSIZE 4096
+#define Z_BUFSIZE       16384
 #define Z_PRINTF_BUFSIZE 4096
 #define ALLOC(size) malloc(size)
 #define TRYFREE(p) {if (p) free(p);}
@@ -38,10 +41,12 @@ typedef struct gz_stream {
    char     *path;   /* path name for debugging only */
    int      transparent; /* 1 if input file is not a .gz file */
    char     mode;    /* 'w' or 'r' */
    long     startpos; /* start of compressed data in file (header skipped) */
 } gz_stream;
 local gzFile gz_open      OF((const char *path, const char *mode, int  fd));
 local int do_flush        OF((gzFile file, int flush));
 local int    get_byte     OF((gz_stream *s));
 local void   check_header OF((gz_stream *s));
 local int    destroy      OF((gz_stream *s));
@@ -64,6 +69,7 @@ local gzFile gz_open (path, mode, fd)
 {
    int err;
    int level = Z_DEFAULT_COMPRESSION; /* compression level */
    int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
    char *p = (char*)mode;
    gz_stream *s;
    char fmode[80]; /* copy of mode, without the compression level */
@@ -99,6 +105,10 @@ local gzFile gz_open (path, mode, fd)
        if (*p == 'w' || *p == 'a') s->mode = 'w';
        if (*p >= '0' && *p <= '9') {
 	    level = *p - '0';
 	} else if (*p == 'f') {
 	  strategy = Z_FILTERED;
 	} else if (*p == 'h') {
 	  strategy = Z_HUFFMAN_ONLY;
 	} else {
 	    *m++ = *p; /* copy the mode */
 	}
@@ -106,19 +116,24 @@ local gzFile gz_open (path, mode, fd)
    if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
    if (s->mode == 'w') {
 #ifdef NO_DEFLATE
        err = Z_STREAM_ERROR;
 #else
        err = deflateInit2(&(s->stream), level,
-                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, 0);
+                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
        /* windowBits is passed < 0 to suppress zlib header */
        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-
+#endif
        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 = (Byte*)ALLOC(Z_BUFSIZE);
        err = inflateInit2(&(s->stream), -MAX_WBITS);
        /* windowBits is passed < 0 to tell that there is no zlib header */
        if (err != Z_OK || s->inbuf == Z_NULL) {
            return destroy(s), (gzFile)Z_NULL;
        }
@@ -126,7 +141,7 @@ local gzFile gz_open (path, mode, fd)
    s->stream.avail_out = Z_BUFSIZE;
    errno = 0;
-    s->file = fd < 0 ? FOPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
+    s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
    if (s->file == NULL) {
        return destroy(s), (gzFile)Z_NULL;
@@ -136,16 +151,24 @@ local gzFile gz_open (path, mode, fd)
         */
        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
 	s->startpos = 10L;
 	/* We use 10L instead of ftell(s->file) to because ftell causes an
         * fflush on some systems. This version of the library doesn't use
         * startpos anyway in write mode, so this initialization is not
         * necessary.
         */
    } else {
 	check_header(s); /* skip the .gz header */
 	s->startpos = (ftell(s->file) - s->stream.avail_in);
    }
    return (gzFile)s;
 }
 /* ===========================================================================
     Opens a gzip (.gz) file for reading or writing.
 */
-gzFile gzopen (path, mode)
+gzFile ZEXPORT gzopen (path, mode)
    const char *path;
    const char *mode;
 {
@@ -156,7 +179,7 @@ gzFile gzopen (path, mode)
     Associate a gzFile with the file descriptor fd. fd is not dup'ed here
   to mimic the behavio(u)r of fdopen.
 */
-gzFile gzdopen (fd, mode)
+gzFile ZEXPORT gzdopen (fd, mode)
    int fd;
    const char *mode;
 {
@@ -168,6 +191,31 @@ gzFile gzdopen (fd, mode)
    return gz_open (name, mode, fd);
 }
 /* ===========================================================================
 * Update the compression level and strategy
 */
 int ZEXPORT gzsetparams (file, level, strategy)
    gzFile file;
    int level;
    int strategy;
 {
    gz_stream *s = (gz_stream*)file;
    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
    /* Make room to allow flushing */
    if (s->stream.avail_out == 0) {
 	s->stream.next_out = s->outbuf;
 	if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
 	    s->z_err = Z_ERRNO;
 	}
 	s->stream.avail_out = Z_BUFSIZE;
    }
    return deflateParams (&(s->stream), level, strategy);
 }
 /* ===========================================================================
     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
   for end of file.
@@ -203,8 +251,8 @@ local int get_byte(s)
 local void check_header(s)
    gz_stream *s;
 {
-    int method = 0;
+    int method; /* method byte */
-    int flags = 0;
+    int flags;  /* flags byte */
    uInt len;
    int c;
@@ -212,8 +260,11 @@ local void check_header(s)
    for (len = 0; len < 2; len++) {
 	c = get_byte(s);
 	if (c != gz_magic[len]) {
-	    s->transparent = 1;
+	    if (len != 0) s->stream.avail_in++, s->stream.next_in--;
-	    if (c != EOF) s->stream.avail_in++, s->stream.next_in--;
+	    if (c != EOF) {
 		s->stream.avail_in++, s->stream.next_in--;
 		s->transparent = 1;
 	    }
 	    s->z_err = s->stream.avail_in != 0 ? Z_OK : Z_STREAM_END;
 	    return;
 	}
@@ -260,14 +311,21 @@ local int destroy (s)
    TRYFREE(s->msg);
    if (s->stream.state != NULL) {
-       if (s->mode == 'w') {
+	if (s->mode == 'w') {
-           err = deflateEnd(&(s->stream));
+#ifdef NO_DEFLATE
-       } else if (s->mode == 'r') {
+	    err = Z_STREAM_ERROR;
-           err = inflateEnd(&(s->stream));
+#else
-       }
+	    err = deflateEnd(&(s->stream));
 #endif
 	} else if (s->mode == 'r') {
 	    err = inflateEnd(&(s->stream));
 	}
    }
    if (s->file != NULL && fclose(s->file)) {
-        err = Z_ERRNO;
+#ifdef ESPIPE
 	if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
 #endif
 	    err = Z_ERRNO;
    }
    if (s->z_err < 0) err = s->z_err;
@@ -282,20 +340,22 @@ local int destroy (s)
     Reads the given number of uncompressed bytes from the compressed file.
   gzread returns the number of bytes actually read (0 for end of file).
 */
-int gzread (file, buf, len)
+int ZEXPORT gzread (file, buf, len)
    gzFile file;
    voidp buf;
    unsigned len;
 {
    gz_stream *s = (gz_stream*)file;
-    Byte *start = buf; /* starting point for crc computation */
+    Bytef *start = (Bytef*)buf; /* starting point for crc computation */
    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
    if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
-    s->stream.next_out = buf;
+    next_out = (Byte*)buf;
    s->stream.next_out = (Bytef*)buf;
    s->stream.avail_out = len;
    while (s->stream.avail_out != 0) {
@@ -306,16 +366,20 @@ int gzread (file, buf, len)
 	    if (n > s->stream.avail_out) n = s->stream.avail_out;
 	    if (n > 0) {
 		zmemcpy(s->stream.next_out, s->stream.next_in, n);
-		s->stream.next_out  += n;
+		next_out += n;
 		s->stream.next_out = next_out;
 		s->stream.next_in   += n;
 		s->stream.avail_out -= n;
 		s->stream.avail_in  -= n;
 	    }
 	    if (s->stream.avail_out > 0) {
-		s->stream.avail_out -= fread(s->stream.next_out,
+		s->stream.avail_out -= fread(next_out, 1, s->stream.avail_out,
-					     1, s->stream.avail_out, s->file);
+					     s->file);
 	    }
-	    return (int)(len - s->stream.avail_out);
+	    len -= s->stream.avail_out;
 	    s->stream.total_in  += (uLong)len;
 	    s->stream.total_out += (uLong)len;
 	    return (int)len;
 	}
        if (s->stream.avail_in == 0 && !s->z_eof) {
@@ -343,7 +407,12 @@ int gzread (file, buf, len)
 		/* Check for concatenated .gz files: */
 		check_header(s);
 		if (s->z_err == Z_OK) {
 		    uLong total_in = s->stream.total_in;
 		    uLong total_out = s->stream.total_out;
 		    inflateReset(&(s->stream));
 		    s->stream.total_in = total_in;
 		    s->stream.total_out = total_out;
 		    s->crc = crc32(0L, Z_NULL, 0);
 		}
 	    }
@@ -355,11 +424,49 @@ int gzread (file, buf, len)
    return (int)(len - s->stream.avail_out);
 }
 /* ===========================================================================
      Reads one byte from the compressed file. gzgetc returns this byte
   or -1 in case of end of file or error.
 */
 int ZEXPORT gzgetc(file)
    gzFile file;
 {
    unsigned char c;
    return gzread(file, &c, 1) == 1 ? c : -1;
 }
 /* ===========================================================================
      Reads bytes from the compressed file until len-1 characters are
   read, or a newline character is read and transferred to buf, or an
   end-of-file condition is encountered.  The string is then terminated
   with a null character.
      gzgets returns buf, or Z_NULL in case of error.
      The current implementation is not optimized at all.
 */
 char * ZEXPORT gzgets(file, buf, len)
    gzFile file;
    char *buf;
    int len;
 {
    char *b = buf;
    if (buf == Z_NULL || len <= 0) return Z_NULL;
    while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
    *buf = '\0';
    return b == buf && len > 0 ? Z_NULL : b;
 }
 #ifndef NO_DEFLATE
 /* ===========================================================================
     Writes the given number of uncompressed bytes into the compressed file.
   gzwrite returns the number of bytes actually written (0 in case of error).
 */
-int gzwrite (file, buf, len)
+int ZEXPORT gzwrite (file, buf, len)
    gzFile file;
    const voidp buf;
    unsigned len;
@@ -368,7 +475,7 @@ int gzwrite (file, buf, len)
    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-    s->stream.next_in = buf;
+    s->stream.next_in = (Bytef*)buf;
    s->stream.avail_in = len;
    while (s->stream.avail_in != 0) {
@@ -385,18 +492,95 @@ int gzwrite (file, buf, len)
        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
        if (s->z_err != Z_OK) break;
    }
-    s->crc = crc32(s->crc, buf, len);
+    s->crc = crc32(s->crc, (const Bytef *)buf, len);
    return (int)(len - s->stream.avail_in);
 }
 /* ===========================================================================
     Converts, formats, and writes the args to the compressed file under
   control of the format string, as in fprintf. gzprintf returns the number of
   uncompressed bytes actually written (0 in case of error).
 */
 #ifdef STDC
 #include <stdarg.h>
 int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
 {
    char buf[Z_PRINTF_BUFSIZE];
    va_list va;
    int len;
    va_start(va, format);
 #ifdef HAS_vsnprintf
    (void)vsnprintf(buf, sizeof(buf), format, va);
 #else
    (void)vsprintf(buf, format, va);
 #endif
    va_end(va);
    len = strlen(buf); /* some *sprintf don't return the nb of bytes written */
    if (len <= 0) return 0;
    return gzwrite(file, buf, (unsigned)len);
 }
 #else /* not ANSI C */
 int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
 	               a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
    gzFile file;
    const char *format;
    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
 	a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
 {
    char buf[Z_PRINTF_BUFSIZE];
    int len;
 #ifdef HAS_snprintf
    snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
 	     a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
 #else
    sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
 	    a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
 #endif
    len = strlen(buf); /* old sprintf doesn't return the nb of bytes written */
    if (len <= 0) return 0;
    return gzwrite(file, buf, len);
 }
 #endif
 /* ===========================================================================
      Writes c, converted to an unsigned char, into the compressed file.
   gzputc returns the value that was written, or -1 in case of error.
 */
 int ZEXPORT gzputc(file, c)
    gzFile file;
    int c;
 {
    unsigned char cc = (unsigned char) c; /* required for big endian systems */
    return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
 }
 /* ===========================================================================
      Writes the given null-terminated string to the compressed file, excluding
   the terminating null character.
      gzputs returns the number of characters written, or -1 in case of error.
 */
 int ZEXPORT gzputs(file, s)
    gzFile file;
    const char *s;
 {
    return gzwrite(file, (const voidp)s, (unsigned)strlen(s));
 }
 /* ===========================================================================
     Flushes all pending output into the compressed file. The parameter
   flush is as in the deflate() function.
     gzflush should be called only when strictly necessary because it can
   degrade compression.
 */
-int gzflush (file, flush)
+local int do_flush (file, flush)
    gzFile file;
    int flush;
 {
@@ -422,6 +606,9 @@ int gzflush (file, flush)
        if (done) break;
        s->z_err = deflate(&(s->stream), flush);
 	/* Ignore the second of two consecutive flushes: */
 	if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
        /* deflate has finished flushing only when it hasn't used up
         * all the available space in the output buffer: 
         */
@@ -429,9 +616,154 @@ int gzflush (file, flush)
        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
    }
    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
 }
 int ZEXPORT gzflush (file, flush)
     gzFile file;
     int flush;
 {
    gz_stream *s = (gz_stream*)file;
    int err = do_flush (file, flush);
    if (err) return err;
    fflush(s->file);
    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
 }
 #endif /* NO_DEFLATE */
 /* ===========================================================================
      Sets the starting position for the next gzread or gzwrite on the given
   compressed file. The offset represents a number of bytes in the
      gzseek returns the resulting offset location as measured in bytes from
   the beginning of the uncompressed stream, or -1 in case of error.
      SEEK_END is not implemented, returns error.
      In this version of the library, gzseek can be extremely slow.
 */
 z_off_t ZEXPORT gzseek (file, offset, whence)
    gzFile file;
    z_off_t offset;
    int whence;
 {
    gz_stream *s = (gz_stream*)file;
    if (s == NULL || whence == SEEK_END ||
 	s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
 	return -1L;
    }
    if (s->mode == 'w') {
 #ifdef NO_DEFLATE
 	return -1L;
 #else
 	if (whence == SEEK_SET) {
 	    offset -= s->stream.total_out;
 	}
 	if (offset < 0) return -1L;
 	/* At this point, offset is the number of zero bytes to write. */
 	if (s->inbuf == Z_NULL) {
 	    s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
 	    zmemzero(s->inbuf, Z_BUFSIZE);
 	}
 	while (offset > 0)  {
 	    uInt size = Z_BUFSIZE;
 	    if (offset < Z_BUFSIZE) size = (uInt)offset;
 	    size = gzwrite(file, s->inbuf, size);
 	    if (size == 0) return -1L;
 	    offset -= size;
 	}
 	return (z_off_t)s->stream.total_in;
 #endif
    }
    /* Rest of function is for reading only */
    /* compute absolute position */
    if (whence == SEEK_CUR) {
 	offset += s->stream.total_out;
    }
    if (offset < 0) return -1L;
    if (s->transparent) {
 	/* map to fseek */
 	s->stream.avail_in = 0;
 	s->stream.next_in = s->inbuf;
        if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
 	s->stream.total_in = s->stream.total_out = (uLong)offset;
 	return offset;
    }
    /* For a negative seek, rewind and use positive seek */
    if ((uLong)offset >= s->stream.total_out) {
 	offset -= s->stream.total_out;
    } else if (gzrewind(file) < 0) {
 	return -1L;
    }
    /* offset is now the number of bytes to skip. */
    if (offset != 0 && s->outbuf == Z_NULL) {
 	s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
    }
    while (offset > 0)  {
 	int size = Z_BUFSIZE;
 	if (offset < Z_BUFSIZE) size = (int)offset;
 	size = gzread(file, s->outbuf, (uInt)size);
 	if (size <= 0) return -1L;
 	offset -= size;
    }
    return (z_off_t)s->stream.total_out;
 }
 /* ===========================================================================
     Rewinds input file. 
 */
 int ZEXPORT gzrewind (file)
    gzFile file;
 {
    gz_stream *s = (gz_stream*)file;
    if (s == NULL || s->mode != 'r') return -1;
    s->z_err = Z_OK;
    s->z_eof = 0;
    s->stream.avail_in = 0;
    s->stream.next_in = s->inbuf;
    if (s->startpos == 0) { /* not a compressed file */
 	rewind(s->file);
 	return 0;
    }
    (void) inflateReset(&s->stream);
    return fseek(s->file, s->startpos, SEEK_SET);
 }
 /* ===========================================================================
     Returns the starting position for the next gzread or gzwrite on the
   given compressed file. This position represents a number of bytes in the
   uncompressed data stream.
 */
 z_off_t ZEXPORT gztell (file)
    gzFile file;
 {
    return gzseek(file, 0L, SEEK_CUR);
 }
 /* ===========================================================================
     Returns 1 when EOF has previously been detected reading the given
   input stream, otherwise zero.
 */
 int ZEXPORT gzeof (file)
    gzFile file;
 {
    gz_stream *s = (gz_stream*)file;
    return (s == NULL || s->mode != 'r') ? 0 : s->z_eof;
 }
 /* ===========================================================================
   Outputs a long in LSB order to the given file
@@ -468,7 +800,7 @@ local uLong getLong (s)
     Flushes all pending output if necessary, closes the compressed file
   and deallocates all the (de)compression state.
 */
-int gzclose (file)
+int ZEXPORT gzclose (file)
    gzFile file;
 {
    int err;
@@ -477,14 +809,17 @@ int gzclose (file)
    if (s == NULL) return Z_STREAM_ERROR;
    if (s->mode == 'w') {
-        err = gzflush (file, Z_FINISH);
+#ifdef NO_DEFLATE
-        if (err != Z_OK) return destroy(file);
+	return Z_STREAM_ERROR;
 #else
        err = do_flush (file, Z_FINISH);
        if (err != Z_OK) return destroy((gz_stream*)file);
        putLong (s->file, s->crc);
        putLong (s->file, s->stream.total_in);
-
+#endif
    }
-    return destroy(file);
+    return destroy((gz_stream*)file);
 }
 /* ===========================================================================
@@ -494,7 +829,7 @@ int gzclose (file)
   errnum is set to Z_ERRNO and the application may consult errno
   to get the exact error code.
 */
-char*  gzerror (file, errnum)
+const char*  ZEXPORT gzerror (file, errnum)
    gzFile file;
    int *errnum;
 {
@@ -503,19 +838,19 @@ char*  gzerror (file, errnum)
    if (s == NULL) {
        *errnum = Z_STREAM_ERROR;
-        return ERR_MSG(Z_STREAM_ERROR);
+        return (const char*)ERR_MSG(Z_STREAM_ERROR);
    }
    *errnum = s->z_err;
-    if (*errnum == Z_OK) return (char*)"";
+    if (*errnum == Z_OK) return (const char*)"";
    m =  (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
-    if (m == NULL || *m == '\0') m = (char*)z_errmsg[1-s->z_err];
+    if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
    TRYFREE(s->msg);
    s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
    strcpy(s->msg, s->path);
    strcat(s->msg, ": ");
    strcat(s->msg, m);
-    return s->msg;
+    return (const char*)s->msg;
 }
--- a/infblock.c
+++ b/infblock.c
@@ -1,5 +1,5 @@
 /* infblock.c -- interpret and process block types to last block
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -12,7 +12,7 @@
 struct inflate_codes_state {int dummy;}; /* for buggy compilers */
 /* Table for deflate from PKZIP's appnote.txt. */
-local uInt border[] = { /* Order of the bit length code lengths */
+local const uInt border[] = { /* Order of the bit length code lengths */
        16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 /*
@@ -63,31 +63,27 @@ local uInt border[] = { /* Order of the bit length code lengths */
 void inflate_blocks_reset(s, z, c)
 inflate_blocks_statef *s;
-z_stream *z;
+z_streamp z;
 uLongf *c;
 {
-  if (s->checkfn != Z_NULL)
+  if (c != Z_NULL)
    *c = s->check;
  if (s->mode == BTREE || s->mode == DTREE)
    ZFREE(z, s->sub.trees.blens);
  if (s->mode == CODES)
  {
    inflate_codes_free(s->sub.decode.codes, z);
    inflate_trees_free(s->sub.decode.td, z);
    inflate_trees_free(s->sub.decode.tl, z);
  }
  s->mode = TYPE;
  s->bitk = 0;
  s->bitb = 0;
  s->read = s->write = s->window;
  if (s->checkfn != Z_NULL)
-    z->adler = s->check = (*s->checkfn)(0L, Z_NULL, 0);
+    z->adler = s->check = (*s->checkfn)(0L, (const Bytef *)Z_NULL, 0);
-  Trace((stderr, "inflate:   blocks reset\n"));
+  Tracev((stderr, "inflate:   blocks reset\n"));
 }
 inflate_blocks_statef *inflate_blocks_new(z, c, w)
-z_stream *z;
+z_streamp z;
 check_func c;
 uInt w;
 {
@@ -96,23 +92,30 @@ uInt w;
  if ((s = (inflate_blocks_statef *)ZALLOC
       (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
    return s;
  if ((s->hufts =
       (inflate_huft *)ZALLOC(z, sizeof(inflate_huft), MANY)) == Z_NULL)
  {
    ZFREE(z, s);
    return Z_NULL;
  }
  if ((s->window = (Bytef *)ZALLOC(z, 1, w)) == Z_NULL)
  {
    ZFREE(z, s->hufts);
    ZFREE(z, s);
    return Z_NULL;
  }
  s->end = s->window + w;
  s->checkfn = c;
  s->mode = TYPE;
-  Trace((stderr, "inflate:   blocks allocated\n"));
+  Tracev((stderr, "inflate:   blocks allocated\n"));
-  inflate_blocks_reset(s, z, &s->check);
+  inflate_blocks_reset(s, z, Z_NULL);
  return s;
 }
 int inflate_blocks(s, z, r)
 inflate_blocks_statef *s;
-z_stream *z;
+z_streamp z;
 int r;
 {
  uInt t;               /* temporary storage */
@@ -136,7 +139,7 @@ int r;
      switch (t >> 1)
      {
        case 0:                         /* stored */
-          Trace((stderr, "inflate:     stored block%s\n",
+          Tracev((stderr, "inflate:     stored block%s\n",
                 s->last ? " (last)" : ""));
          DUMPBITS(3)
          t = k & 7;                    /* go to byte boundary */
@@ -144,27 +147,25 @@ int r;
          s->mode = LENS;               /* get length of stored block */
          break;
        case 1:                         /* fixed */
-          Trace((stderr, "inflate:     fixed codes block%s\n",
+          Tracev((stderr, "inflate:     fixed codes block%s\n",
                 s->last ? " (last)" : ""));
          {
            uInt bl, bd;
            inflate_huft *tl, *td;
-            inflate_trees_fixed(&bl, &bd, &tl, &td);
+            inflate_trees_fixed(&bl, &bd, &tl, &td, z);
            s->sub.decode.codes = inflate_codes_new(bl, bd, tl, td, z);
            if (s->sub.decode.codes == Z_NULL)
            {
              r = Z_MEM_ERROR;
              LEAVE
            }
            s->sub.decode.tl = Z_NULL;  /* don't try to free these */
            s->sub.decode.td = Z_NULL;
          }
          DUMPBITS(3)
          s->mode = CODES;
          break;
        case 2:                         /* dynamic */
-          Trace((stderr, "inflate:     dynamic codes block%s\n",
+          Tracev((stderr, "inflate:     dynamic codes block%s\n",
                 s->last ? " (last)" : ""));
          DUMPBITS(3)
          s->mode = TABLE;
@@ -189,7 +190,7 @@ int r;
      s->sub.left = (uInt)b & 0xffff;
      b = k = 0;                      /* dump bits */
      Tracev((stderr, "inflate:       stored length %u\n", s->sub.left));
-      s->mode = s->sub.left ? STORED : TYPE;
+      s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE);
      break;
    case STORED:
      if (n == 0)
@@ -221,8 +222,6 @@ int r;
      }
 #endif
      t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
      if (t < 19)
        t = 19;
      if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
      {
        r = Z_MEM_ERROR;
@@ -243,9 +242,10 @@ int r;
        s->sub.trees.blens[border[s->sub.trees.index++]] = 0;
      s->sub.trees.bb = 7;
      t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb,
-                             &s->sub.trees.tb, z);
+                             &s->sub.trees.tb, s->hufts, z);
      if (t != Z_OK)
      {
        ZFREE(z, s->sub.trees.blens);
        r = t;
        if (r == Z_DATA_ERROR)
          s->mode = BAD;
@@ -284,6 +284,7 @@ int r;
          if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
              (c == 16 && i < 1))
          {
            ZFREE(z, s->sub.trees.blens);
            s->mode = BAD;
            z->msg = (char*)"invalid bit length repeat";
            r = Z_DATA_ERROR;
@@ -296,7 +297,6 @@ int r;
          s->sub.trees.index = i;
        }
      }
      inflate_trees_free(s->sub.trees.tb, z);
      s->sub.trees.tb = Z_NULL;
      {
        uInt bl, bd;
@@ -307,7 +307,9 @@ int r;
        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);
+                                  s->sub.trees.blens, &bl, &bd, &tl, &td,
                                  s->hufts, z);
        ZFREE(z, s->sub.trees.blens);
        if (t != Z_OK)
        {
          if (t == (uInt)Z_DATA_ERROR)
@@ -318,15 +320,10 @@ int r;
        Tracev((stderr, "inflate:       trees ok\n"));
        if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
        {
          inflate_trees_free(td, z);
          inflate_trees_free(tl, z);
          r = Z_MEM_ERROR;
          LEAVE
        }
        ZFREE(z, s->sub.trees.blens);
        s->sub.decode.codes = c;
        s->sub.decode.tl = tl;
        s->sub.decode.td = td;
      }
      s->mode = CODES;
    case CODES:
@@ -335,8 +332,6 @@ int r;
        return inflate_flush(s, z, r);
      r = Z_OK;
      inflate_codes_free(s->sub.decode.codes, z);
      inflate_trees_free(s->sub.decode.td, z);
      inflate_trees_free(s->sub.decode.tl, z);
      LOAD
      Tracev((stderr, "inflate:       codes end, %lu total out\n",
              z->total_out + (q >= s->read ? q - s->read :
@@ -372,25 +367,35 @@ int r;
 }
-int inflate_blocks_free(s, z, c)
+int inflate_blocks_free(s, z)
 inflate_blocks_statef *s;
-z_stream *z;
+z_streamp z;
 uLongf *c;
 {
-  inflate_blocks_reset(s, z, c);
+  inflate_blocks_reset(s, z, Z_NULL);
  ZFREE(z, s->window);
  ZFREE(z, s->hufts);
  ZFREE(z, s);
-  Trace((stderr, "inflate:   blocks freed\n"));
+  Tracev((stderr, "inflate:   blocks freed\n"));
  return Z_OK;
 }
-void inflate_set_dictionary(s, z, d, n)
+void inflate_set_dictionary(s, d, n)
 inflate_blocks_statef *s;
 z_stream *z;
 const Bytef *d;
 uInt  n;
 {
-  zmemcpy((charf *)s->window, d, n);
+  zmemcpy(s->window, d, n);
  s->read = s->write = s->window + n;
 }
 /* Returns true if inflate is currently at the end of a block generated
 * by Z_SYNC_FLUSH or Z_FULL_FLUSH. 
 * IN assertion: s != Z_NULL
 */
 int inflate_blocks_sync_point(s)
 inflate_blocks_statef *s;
 {
  return s->mode == LENS;
 }
--- a/infblock.h
+++ b/infblock.h
@@ -1,5 +1,5 @@
 /* infblock.h -- header to use infblock.c
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -12,27 +12,28 @@ struct inflate_blocks_state;
 typedef struct inflate_blocks_state FAR inflate_blocks_statef;
 extern inflate_blocks_statef * inflate_blocks_new OF((
-    z_stream *z,
+    z_streamp z,
    check_func c,               /* check function */
    uInt w));                   /* window size */
 extern int inflate_blocks OF((
    inflate_blocks_statef *,
-    z_stream *,
+    z_streamp ,
    int));                      /* initial return code */
 extern void inflate_blocks_reset OF((
    inflate_blocks_statef *,
-    z_stream *,
+    z_streamp ,
    uLongf *));                  /* check value on output */
 extern int inflate_blocks_free OF((
    inflate_blocks_statef *,
-    z_stream *,
+    z_streamp));
    uLongf *));                  /* check value on output */
 extern void inflate_set_dictionary OF((
    inflate_blocks_statef *s,
    z_stream *z,
    const Bytef *d,  /* dictionary */
    uInt  n));       /* dictionary length */
 extern int inflate_blocks_sync_point OF((
    inflate_blocks_statef *s));
--- a/infcodes.c
+++ b/infcodes.c
@@ -1,5 +1,5 @@
 /* infcodes.c -- process literals and length/distance pairs
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -16,11 +16,7 @@
 #define exop word.what.Exop
 #define bits word.what.Bits
-/* inflate codes private state */
+typedef enum {        /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
 struct inflate_codes_state {
  /* mode */
  enum {        /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
      START,    /* x: set up for LEN */
      LEN,      /* i: get length/literal/eob next */
      LENEXT,   /* i: getting length extra (have base) */
@@ -31,7 +27,13 @@ struct inflate_codes_state {
      WASH,     /* o: got eob, possibly still output waiting */
      END,      /* x: got eob and all data flushed */
      BADCODE}  /* x: got error */
-    mode;               /* current inflate_codes mode */
+inflate_codes_mode;
 /* inflate codes private state */
 struct inflate_codes_state {
  /* mode */
  inflate_codes_mode mode;      /* current inflate_codes mode */
  /* mode dependent information */
  uInt len;
@@ -60,7 +62,7 @@ inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z)
 uInt bl, bd;
 inflate_huft *tl;
 inflate_huft *td; /* need separate declaration for Borland C++ */
-z_stream *z;
+z_streamp z;
 {
  inflate_codes_statef *c;
@@ -80,7 +82,7 @@ z_stream *z;
 int inflate_codes(s, z, r)
 inflate_blocks_statef *s;
-z_stream *z;
+z_streamp z;
 int r;
 {
  uInt j;               /* temporary storage */
@@ -235,12 +237,15 @@ int r;
      r = Z_STREAM_ERROR;
      LEAVE
  }
 #ifdef NEED_DUMMY_RETURN
  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
 #endif
 }
 void inflate_codes_free(c, z)
 inflate_codes_statef *c;
-z_stream *z;
+z_streamp z;
 {
  ZFREE(z, c);
  Tracev((stderr, "inflate:       codes free\n"));
--- a/infcodes.h
+++ b/infcodes.h
@@ -1,5 +1,5 @@
 /* infcodes.h -- header to use infcodes.c
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -14,14 +14,14 @@ typedef struct inflate_codes_state FAR inflate_codes_statef;
 extern inflate_codes_statef *inflate_codes_new OF((
    uInt, uInt,
    inflate_huft *, inflate_huft *,
-    z_stream *));
+    z_streamp ));
 extern int inflate_codes OF((
    inflate_blocks_statef *,
-    z_stream *,
+    z_streamp ,
    int));
 extern void inflate_codes_free OF((
    inflate_codes_statef *,
-    z_stream *));
+    z_streamp ));
--- a/inffast.c
+++ b/inffast.c
@@ -1,5 +1,5 @@
 /* inffast.c -- process literals and length/distance pairs fast
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -32,7 +32,7 @@ uInt bl, bd;
 inflate_huft *tl;
 inflate_huft *td; /* need separate declaration for Borland C++ */
 inflate_blocks_statef *s;
-z_stream *z;
+z_streamp z;
 {
  inflate_huft *t;      /* temporary pointer */
  uInt e;               /* extra bits or operation */
--- a/inffast.h
+++ b/inffast.h
@@ -1,5 +1,5 @@
 /* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -14,4 +14,4 @@ extern int inflate_fast OF((
    inflate_huft *,
    inflate_huft *,
    inflate_blocks_statef *,
-    z_stream *));
+    z_streamp ));
--- a/inflate.c
+++ b/inflate.c
@@ -1,5 +1,5 @@
 /* inflate.c -- zlib interface to inflate modules
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -8,11 +8,7 @@
 struct inflate_blocks_state {int dummy;}; /* for buggy compilers */
-/* inflate private state */
+typedef enum {
 struct internal_state {
  /* mode */
  enum {
      METHOD,   /* waiting for method byte */
      FLAG,     /* waiting for flag byte */
      DICT4,    /* four dictionary check bytes to go */
@@ -27,7 +23,13 @@ struct internal_state {
      CHECK1,   /* one check byte to go */
      DONE,     /* finished check, done */
      BAD}      /* got an error--stay here */
-    mode;               /* current inflate mode */
+inflate_mode;
 /* inflate private state */
 struct internal_state {
  /* mode */
  inflate_mode  mode;   /* current inflate mode */
  /* mode dependent information */
  union {
@@ -48,40 +50,36 @@ struct internal_state {
 };
-int inflateReset(z)
+int ZEXPORT inflateReset(z)
-z_stream *z;
+z_streamp z;
 {
  uLong c;
  if (z == Z_NULL || z->state == Z_NULL)
    return Z_STREAM_ERROR;
  z->total_in = z->total_out = 0;
  z->msg = Z_NULL;
  z->state->mode = z->state->nowrap ? BLOCKS : METHOD;
-  inflate_blocks_reset(z->state->blocks, z, &c);
+  inflate_blocks_reset(z->state->blocks, z, Z_NULL);
-  Trace((stderr, "inflate: reset\n"));
+  Tracev((stderr, "inflate: reset\n"));
  return Z_OK;
 }
-int inflateEnd(z)
+int ZEXPORT inflateEnd(z)
-z_stream *z;
+z_streamp z;
 {
  uLong c;
  if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL)
    return Z_STREAM_ERROR;
  if (z->state->blocks != Z_NULL)
-    inflate_blocks_free(z->state->blocks, z, &c);
+    inflate_blocks_free(z->state->blocks, z);
  ZFREE(z, z->state);
  z->state = Z_NULL;
-  Trace((stderr, "inflate: end\n"));
+  Tracev((stderr, "inflate: end\n"));
  return Z_OK;
 }
-int inflateInit2_(z, w, version, stream_size)
+int ZEXPORT inflateInit2_(z, w, version, stream_size)
-z_stream *z;
+z_streamp z;
 int w;
 const char *version;
 int stream_size;
@@ -129,7 +127,7 @@ int stream_size;
    inflateEnd(z);
    return Z_MEM_ERROR;
  }
-  Trace((stderr, "inflate: allocated\n"));
+  Tracev((stderr, "inflate: allocated\n"));
  /* reset state */
  inflateReset(z);
@@ -137,8 +135,8 @@ int stream_size;
 }
-int inflateInit_(z, version, stream_size)
+int ZEXPORT inflateInit_(z, version, stream_size)
-z_stream *z;
+z_streamp z;
 const char *version;
 int stream_size;
 {
@@ -146,18 +144,19 @@ int stream_size;
 }
-#define NEEDBYTE {if(z->avail_in==0)return r;r=Z_OK;}
+#define NEEDBYTE {if(z->avail_in==0)return r;r=f;}
 #define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
-int inflate(z, f)
+int ZEXPORT inflate(z, f)
-z_stream *z;
+z_streamp z;
 int f;
 {
-  int r = f;    /* to avoid warning about unused f */
+  int r;
  uInt b;
  if (z == Z_NULL || z->state == Z_NULL || z->next_in == Z_NULL)
    return Z_STREAM_ERROR;
  f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK;
  r = Z_BUF_ERROR;
  while (1) switch (z->state->mode)
  {
@@ -188,11 +187,11 @@ int f;
        z->state->sub.marker = 5;       /* can't try inflateSync */
        break;
      }
-      Trace((stderr, "inflate: zlib header ok\n"));
+      Tracev((stderr, "inflate: zlib header ok\n"));
      if (!(b & PRESET_DICT))
      {
        z->state->mode = BLOCKS;
-	break;
+        break;
      }
      z->state->mode = DICT4;
    case DICT4:
@@ -226,9 +225,11 @@ int f;
        z->state->sub.marker = 0;       /* can try inflateSync */
        break;
      }
      if (r == Z_OK)
        r = f;
      if (r != Z_STREAM_END)
        return r;
-      r = Z_OK;
+      r = f;
      inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was);
      if (z->state->nowrap)
      {
@@ -259,7 +260,7 @@ int f;
        z->state->sub.marker = 5;       /* can't try inflateSync */
        break;
      }
-      Trace((stderr, "inflate: zlib check ok\n"));
+      Tracev((stderr, "inflate: zlib check ok\n"));
      z->state->mode = DONE;
    case DONE:
      return Z_STREAM_END;
@@ -268,11 +269,14 @@ int f;
    default:
      return Z_STREAM_ERROR;
  }
 #ifdef NEED_DUMMY_RETURN
  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
 #endif
 }
-int inflateSetDictionary(z, dictionary, dictLength)
+int ZEXPORT inflateSetDictionary(z, dictionary, dictLength)
-z_stream *z;
+z_streamp z;
 const Bytef *dictionary;
 uInt  dictLength;
 {
@@ -280,22 +284,23 @@ uInt  dictLength;
  if (z == Z_NULL || z->state == Z_NULL || z->state->mode != DICT0)
    return Z_STREAM_ERROR;
  if (adler32(1L, dictionary, dictLength) != z->adler) return Z_DATA_ERROR;
  z->adler = 1L;
-  if (length >= (1<<z->state->wbits))
+  if (length >= ((uInt)1<<z->state->wbits))
  {
    length = (1<<z->state->wbits)-1;
    dictionary += dictLength - length;
  }
-  inflate_set_dictionary(z->state->blocks, z, dictionary, length);
+  inflate_set_dictionary(z->state->blocks, dictionary, length);
  z->state->mode = BLOCKS;
  return Z_OK;
 }
-int inflateSync(z)
+int ZEXPORT inflateSync(z)
-z_stream *z;
+z_streamp z;
 {
  uInt n;       /* number of bytes to look at */
  Bytef *p;     /* pointer to bytes */
@@ -318,7 +323,8 @@ z_stream *z;
  /* search */
  while (n && m < 4)
  {
-    if (*p == (Byte)(m < 2 ? 0 : 0xff))
+    static const Byte mark[4] = {0, 0, 0xff, 0xff};
    if (*p == mark[m])
      m++;
    else if (*p)
      m = 0;
@@ -342,3 +348,19 @@ z_stream *z;
  z->state->mode = BLOCKS;
  return Z_OK;
 }
 /* Returns true if inflate is currently at the end of a block generated
 * by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
 * implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH
 * but removes the length bytes of the resulting empty stored block. When
 * decompressing, PPP checks that at the end of input packet, inflate is
 * waiting for these length bytes.
 */
 int ZEXPORT inflateSyncPoint(z)
 z_streamp z;
 {
  if (z == Z_NULL || z->state == Z_NULL || z->state->blocks == Z_NULL)
    return Z_STREAM_ERROR;
  return inflate_blocks_sync_point(z->state->blocks);
 }
--- a/inftrees.c
+++ b/inftrees.c
@@ -1,12 +1,13 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
 #include "zutil.h"
 #include "inftrees.h"
-char inflate_copyright[] = " inflate 1.0 Copyright 1995-1996 Mark Adler ";
+const char inflate_copyright[] =
   " inflate 1.1.1 Copyright 1995-1998 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
@@ -26,30 +27,27 @@ local int huft_build OF((
    uIntf *,            /* code lengths in bits */
    uInt,               /* number of codes */
    uInt,               /* number of "simple" codes */
-    uIntf *,            /* list of base values for non-simple codes */
+    const uIntf *,      /* list of base values for non-simple codes */
-    uIntf *,            /* list of extra bits for non-simple codes */
+    const 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 */
+    inflate_huft *,     /* space for trees */
-
+    uInt *,             /* hufts used in space */
-local voidpf falloc OF((
+    uIntf * ));         /* space for values */
    voidpf,             /* opaque pointer (not used) */
    uInt,               /* number of items */
    uInt));             /* size of item */
 /* Tables for deflate from PKZIP's appnote.txt. */
-local uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
+local const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-        /* actually lengths - 2; also see note #13 above about 258 */
+        /* see note #13 above about 258 */
-local uInt cplext[31] = { /* Extra bits for literal codes 257..285 */
+local const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */
        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 192, 192}; /* 192==invalid */
+        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */
-local uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */
+local const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */
        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
        8193, 12289, 16385, 24577};
-local uInt cpdext[30] = { /* Extra bits for distance codes */
+local const uInt cpdext[30] = { /* Extra bits for distance codes */
        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
        12, 12, 13, 13};
@@ -89,26 +87,23 @@ local uInt cpdext[30] = { /* Extra bits for distance codes */
 /* If BMAX needs to be larger than 16, then h and x[] should be uLong. */
 #define BMAX 15         /* maximum bit length of any code */
 #define N_MAX 288       /* maximum number of codes in any set */
-#ifdef DEBUG
+local int huft_build(b, n, s, d, e, t, m, hp, hn, v)
  uInt inflate_hufts;
 #endif
 local int huft_build(b, n, s, d, e, t, m, zs)
 uIntf *b;               /* code lengths in bits (all assumed <= BMAX) */
-uInt n;                 /* number of codes (assumed <= N_MAX) */
+uInt n;                 /* number of codes (assumed <= 288) */
 uInt s;                 /* number of simple-valued codes (0..s-1) */
-uIntf *d;               /* list of base values for non-simple codes */
+const uIntf *d;         /* list of base values for non-simple codes */
-uIntf *e;               /* list of extra bits for non-simple codes */  
+const 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 */
+inflate_huft *hp;       /* space for trees */
 uInt *hn;               /* hufts used in space */
 uIntf *v;               /* working area: values in order of bit length */
 /* 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
   if the given code set is incomplete (the tables are still built in this
-   case), Z_DATA_ERROR if the input is invalid (all zero length codes or an
+   case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of
-   over-subscribed set of lengths), or Z_MEM_ERROR if not enough memory. */
+   lengths), or Z_MEM_ERROR if not enough memory. */
 {
  uInt a;                       /* counter for codes of length k */
@@ -120,11 +115,11 @@ 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) */
  uInt mask;                    /* (1 << w) - 1, to avoid cc -O bug on HP */
  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 */
  uIntf *xp;                    /* pointer into x */
@@ -190,6 +185,7 @@ z_stream *zs;           /* for zalloc function */
    if ((j = *p++) != 0)
      v[x[j]++] = i;
  } while (++i < n);
  n = x[g];                     /* set n to length of v */
  /* Generate the Huffman codes and for each, make the table entries */
@@ -215,7 +211,8 @@ z_stream *zs;           /* for zalloc function */
        w += l;                 /* previous table always l bits */
        /* compute minimum size table less than or equal to l bits */
-        z = (z = g - w) > (uInt)l ? l : z;      /* table size upper limit */
+        z = g - w;
        z = z > (uInt)l ? l : z;        /* table size upper limit */
        if ((f = 1 << (j = k - w)) > a + 1)     /* try a k-w bit table */
        {                       /* too few codes for k-w bit table */
          f -= a + 1;           /* deduct codes from patterns left */
@@ -230,20 +227,16 @@ z_stream *zs;           /* for zalloc function */
        }
        z = 1 << j;             /* table entries for j-bit table */
-        /* allocate and link in new table */
+        /* allocate new table */
-        if ((q = (inflate_huft *)ZALLOC
+        if (*hn + z > MANY)     /* (note: doesn't matter for fixed) */
             (zs,z + 1,sizeof(inflate_huft))) == Z_NULL)
        {
          if (h)
            inflate_trees_free(u[0], zs);
          return Z_MEM_ERROR;   /* not enough memory */
        u[h] = q = hp + *hn;
        *hn += z;
        if (t != Z_NULL)        /* first table is returned result */
        {
          *t = q;
          t = Z_NULL;
        }
 #ifdef DEBUG
        inflate_hufts += z + 1;
 #endif
        *t = q + 1;             /* link to list for huft_free() */
        *(t = &(q->next)) = Z_NULL;
        u[h] = ++q;             /* table starts after link */
        /* connect to last table, if there is one */
        if (h)
@@ -268,7 +261,7 @@ z_stream *zs;           /* for zalloc function */
      }
      else
      {
-        r.exop = (Byte)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];
      }
@@ -283,10 +276,12 @@ z_stream *zs;           /* for zalloc function */
      i ^= j;
      /* backup over finished tables */
-      while ((i & ((1 << w) - 1)) != x[h])
+      mask = (1 << w) - 1;      /* needed on HP, cc -O bug */
      while ((i & mask) != x[h])
      {
        h--;                    /* don't need to update q */
        w -= l;
        mask = (1 << w) - 1;
      }
    }
  }
@@ -297,28 +292,34 @@ z_stream *zs;           /* for zalloc function */
 }
-int inflate_trees_bits(c, bb, tb, z)
+int inflate_trees_bits(c, bb, tb, hp, z)
 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 */
+inflate_huft *hp;       /* space for trees */
 z_streamp z;            /* for messages */
 {
  int r;
  uInt hn = 0;          /* hufts used in space */
  uIntf *v;             /* work area for huft_build */
-  r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL, tb, bb, z);
+  if ((v = (uIntf*)ZALLOC(z, 19, sizeof(uInt))) == Z_NULL)
    return Z_MEM_ERROR;
  r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL,
                 tb, bb, hp, &hn, v);
  if (r == Z_DATA_ERROR)
    z->msg = (char*)"oversubscribed dynamic bit lengths tree";
-  else if (r == Z_BUF_ERROR)
+  else if (r == Z_BUF_ERROR || *bb == 0)
  {
    inflate_trees_free(*tb, z);
    z->msg = (char*)"incomplete dynamic bit lengths tree";
    r = Z_DATA_ERROR;
  }
  ZFREE(z, v);
  return r;
 }
-int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, z)
+int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, hp, z)
 uInt nl;                /* number of literal/length codes */
 uInt nd;                /* number of distance codes */
 uIntf *c;               /* that many (total) code lengths */
@@ -326,51 +327,65 @@ 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 */
+inflate_huft *hp;       /* space for trees */
 z_streamp z;            /* for messages */
 {
  int r;
  uInt hn = 0;          /* hufts used in space */
  uIntf *v;             /* work area for huft_build */
  /* allocate work area */
  if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
    return Z_MEM_ERROR;
  /* build literal/length tree */
-  if ((r = huft_build(c, nl, 257, cplens, cplext, tl, bl, z)) != Z_OK)
+  r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v);
  if (r != Z_OK || *bl == 0)
  {
    if (r == Z_DATA_ERROR)
      z->msg = (char*)"oversubscribed literal/length tree";
-    else if (r == Z_BUF_ERROR)
+    else if (r != Z_MEM_ERROR)
    {
      inflate_trees_free(*tl, z);
      z->msg = (char*)"incomplete literal/length tree";
      r = Z_DATA_ERROR;
    }
    ZFREE(z, v);
    return r;
  }
  /* build distance tree */
-  if ((r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, z)) != Z_OK)
+  r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v);
  if (r != Z_OK || (*bd == 0 && nl > 257))
  {
    if (r == Z_DATA_ERROR)
-      z->msg = (char*)"oversubscribed literal/length tree";
+      z->msg = (char*)"oversubscribed distance tree";
    else if (r == Z_BUF_ERROR) {
 #ifdef PKZIP_BUG_WORKAROUND
      r = Z_OK;
    }
 #else
-      inflate_trees_free(*td, z);
+      z->msg = (char*)"incomplete distance tree";
      z->msg = (char*)"incomplete literal/length tree";
      r = Z_DATA_ERROR;
    }
-    inflate_trees_free(*tl, z);
+    else if (r != Z_MEM_ERROR)
    {
      z->msg = (char*)"empty distance tree with lengths";
      r = Z_DATA_ERROR;
    }
    ZFREE(z, v);
    return r;
 #endif
  }
  /* done */
  ZFREE(z, v);
  return Z_OK;
 }
 /* build fixed tables only once--keep them here */
 local int fixed_built = 0;
-#define FIXEDH 530      /* number of hufts used by fixed tables */
+#define FIXEDH 424      /* number of hufts used by fixed tables */
 local inflate_huft fixed_mem[FIXEDH];
 local uInt fixed_bl;
 local uInt fixed_bd;
@@ -378,36 +393,29 @@ local inflate_huft *fixed_tl;
 local inflate_huft *fixed_td;
-local voidpf falloc(q, n, s)
+int inflate_trees_fixed(bl, bd, tl, td, z)
 voidpf q;       /* opaque pointer */
 uInt n;         /* number of items */
 uInt s;         /* size of item */
 {
  Assert(s == sizeof(inflate_huft) && n <= *(intf *)q,
         "inflate_trees falloc overflow");
  *(intf *)q -= n+s-s; /* s-s to avoid warning */
  return (voidpf)(fixed_mem + *(intf *)q);
 }
 int inflate_trees_fixed(bl, bd, tl, td)
 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_streamp z;             /* for memory allocation */
 {
  /* 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 */
+    uInt f = 0;         /* number of hufts used in fixed_mem */
-    z_stream z;         /* for falloc function */
+    uIntf *c;           /* length list for huft_build */
-    int f = FIXEDH;     /* number of hufts left in fixed_mem */
+    uIntf *v;           /* work area for huft_build */
-    /* set up fake z_stream for memory routines */
+    /* allocate memory */
-    z.zalloc = falloc;
+    if ((c = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
-    z.zfree = Z_NULL;
+      return Z_MEM_ERROR;
-    z.opaque = (voidpf)&f;
+    if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
    {
      ZFREE(z, c);
      return Z_MEM_ERROR;
    }
    /* literal table */
    for (k = 0; k < 144; k++)
@@ -419,16 +427,19 @@ inflate_huft * FAR *td;  /* distance tree result */
    for (; k < 288; k++)
      c[k] = 8;
    fixed_bl = 7;
-    huft_build(c, 288, 257, cplens, cplext, &fixed_tl, &fixed_bl, &z);
+    huft_build(c, 288, 257, cplens, cplext, &fixed_tl, &fixed_bl,
               fixed_mem, &f, v);
    /* distance table */
    for (k = 0; k < 30; k++)
      c[k] = 5;
    fixed_bd = 5;
-    huft_build(c, 30, 0, cpdist, cpdext, &fixed_td, &fixed_bd, &z);
+    huft_build(c, 30, 0, cpdist, cpdext, &fixed_td, &fixed_bd,
               fixed_mem, &f, v);
    /* done */
-    Assert(f == 0, "invalid build of fixed tables");
+    ZFREE(z, v);
    ZFREE(z, c);
    fixed_built = 1;
  }
  *bl = fixed_bl;
@@ -437,33 +448,3 @@ inflate_huft * FAR *td;  /* distance tree result */
  *td = fixed_td;
  return Z_OK;
 }
 int inflate_trees_free(t, z)
 inflate_huft *t;        /* table to free */
 z_stream *z;            /* for zfree function */
 /* Free the malloc'ed tables built by huft_build(), which makes a linked
   list of the tables it made, with the links in a dummy first entry of
   each table. */
 {
  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. */
  while (p != Z_NULL)
  {
    q = (--p)->next;
    ZFREE(z,p);
    p = q;
  } 
  return Z_OK;
 }
--- a/inftrees.h
+++ b/inftrees.h
@@ -1,5 +1,5 @@
 /* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -27,15 +27,19 @@ struct inflate_huft_s {
  } more;
 };
-#ifdef DEBUG
+/* Maximum size of dynamic tree.  The maximum found in a long but non-
-  extern uInt inflate_hufts;
+   exhaustive search was 1041 huft structures (875 for length/literals
-#endif
+   and 166 for distances, the latter actually the result of an
   exhaustive search).  The actual maximum is not known, but the
   value below is more than safe. */
 #define MANY 1440
 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 */
+    inflate_huft *,             /* space for trees */
    z_streamp));                /* for messages */
 extern int inflate_trees_dynamic OF((
    uInt,                       /* number of literal/length codes */
@@ -45,15 +49,12 @@ extern int inflate_trees_dynamic OF((
    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 */
+    inflate_huft *,             /* space for trees */
    z_streamp));                /* for messages */
 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 */
+    inflate_huft * FAR *,       /* distance tree result */
-
+    z_streamp));                /* for memory allocation */
 extern int inflate_trees_free OF((
    inflate_huft *,             /* tables to free */
    z_stream *));               /* for zfree function */
--- a/infutil.c
+++ b/infutil.c
@@ -1,5 +1,5 @@
 /* inflate_util.c -- data and routines common to blocks and codes
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -22,11 +22,12 @@ uInt inflate_mask[17] = {
 /* copy as much as possible from the sliding window to the output area */
 int inflate_flush(s, z, r)
 inflate_blocks_statef *s;
-z_stream *z;
+z_streamp z;
 int r;
 {
  uInt n;
-  Bytef *p, *q;
+  Bytef *p;
  Bytef *q;
  /* local copies of source and destination pointers */
  p = z->next_out;
--- a/infutil.h
+++ b/infutil.h
@@ -1,5 +1,5 @@
 /* infutil.h -- types and macros common to blocks and codes
- * Copyright (C) 1995-1996 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -41,7 +41,6 @@ struct inflate_blocks_state {
      inflate_huft *tb;         /* bit length decoding tree */
    } trees;            /* if DTREE, decoding info for trees */
    struct {
      inflate_huft *tl, *td;    /* trees to free */
      inflate_codes_statef 
         *codes;
    } decode;           /* if CODES, current state */
@@ -51,6 +50,7 @@ struct inflate_blocks_state {
  /* mode independent information */
  uInt bitk;            /* bits in bit buffer */
  uLong bitb;           /* bit buffer */
  inflate_huft *hufts;  /* single malloc for tree space */
  Bytef *window;        /* sliding window */
  Bytef *end;           /* one byte after sliding window */
  Bytef *read;          /* window read pointer */
@@ -90,7 +90,7 @@ extern uInt inflate_mask[17];
 /* copy as much as possible from the sliding window to the output area */
 extern int inflate_flush OF((
    inflate_blocks_statef *,
-    z_stream *,
+    z_streamp ,
    int));
 struct internal_state      {int dummy;}; /* for buggy compilers */
--- a/minigzip.c
+++ b/minigzip.c
@@ -1,5 +1,5 @@
 /* minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995-1996 Jean-loup Gailly.
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -13,7 +13,7 @@
 * or in pipe mode.
 */
-/* $Id: minigzip.c,v 1.5 1995/05/03 17:27:11 jloup Exp $ */
+/* @(#) $Id$ */
 #include <stdio.h>
 #include "zlib.h"
@@ -24,7 +24,12 @@
 #else
   extern void exit  OF((int));
 #endif
-extern int unlink OF((const char *));
+
 #ifdef USE_MMAP
 #  include <sys/types.h>
 #  include <sys/mman.h>
 #  include <sys/stat.h>
 #endif
 #if defined(MSDOS) || defined(OS2) || defined(WIN32)
 #  include <fcntl.h>
@@ -35,29 +40,45 @@ extern int unlink OF((const char *));
 #endif
 #ifdef VMS
 #  define unlink delete
 #  define GZ_SUFFIX "-gz"
-#else
+#endif
 #ifdef RISCOS
 #  define unlink remove
 #  define GZ_SUFFIX "-gz"
 #  define fileno(file) file->__file
 #endif
 #ifndef WIN32 /* unlink already in stdio.h for WIN32 */
  extern int unlink OF((const char *));
 #endif
 #ifndef GZ_SUFFIX
 #  define GZ_SUFFIX ".gz"
 #endif
-#define SUFFIX_LEN sizeof(GZ_SUFFIX)
+#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
-#define BUFLEN 4096
+#define BUFLEN      16384
 #define MAX_NAME_LEN 1024
-#define local static
+#ifdef MAXSEG_64K
-/* For MSDOS and other systems with limitation on stack size. For Unix,
+#  define local static
-    #define local
+   /* Needed for systems with limitation on stack size. */
-   works also.
+#else
- */
+#  define local
 #endif
 char *prog;
-void error           OF((const char *msg));
+void error            OF((const char *msg));
-void gz_compress     OF((FILE   *in, gzFile out));
+void gz_compress      OF((FILE   *in, gzFile out));
-void gz_uncompress   OF((gzFile in, FILE   *out));
+#ifdef USE_MMAP
-void file_compress   OF((char  *file));
+int  gz_compress_mmap OF((FILE   *in, gzFile out));
-void file_uncompress OF((char  *file));
+#endif
-int  main            OF((int argc, char *argv[]));
+void gz_uncompress    OF((gzFile in, FILE   *out));
 void file_compress    OF((char  *file, char *mode));
 void file_uncompress  OF((char  *file));
 int  main             OF((int argc, char *argv[]));
 /* ===========================================================================
 * Display error message and exit
@@ -72,6 +93,7 @@ void error(msg)
 /* ===========================================================================
 * Compress input to output then close both files.
 */
 void gz_compress(in, out)
    FILE   *in;
    gzFile out;
@@ -80,6 +102,12 @@ void gz_compress(in, out)
    int len;
    int err;
 #ifdef USE_MMAP
    /* Try first compressing with mmap. If mmap fails (minigzip used in a
     * pipe), use the normal fread loop.
     */
    if (gz_compress_mmap(in, out) == Z_OK) return;
 #endif
    for (;;) {
        len = fread(buf, 1, sizeof(buf), in);
        if (ferror(in)) {
@@ -94,6 +122,43 @@ void gz_compress(in, out)
    if (gzclose(out) != Z_OK) error("failed gzclose");
 }
 #ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
 /* Try compressing the input file at once using mmap. Return Z_OK if
 * if success, Z_ERRNO otherwise.
 */
 int gz_compress_mmap(in, out)
    FILE   *in;
    gzFile out;
 {
    int len;
    int err;
    int ifd = fileno(in);
    caddr_t buf;    /* mmap'ed buffer for the entire input file */
    off_t buf_len;  /* length of the input file */
    struct stat sb;
    /* Determine the size of the file, needed for mmap: */
    if (fstat(ifd, &sb) < 0) return Z_ERRNO;
    buf_len = sb.st_size;
    if (buf_len <= 0) return Z_ERRNO;
    /* Now do the actual mmap: */
    buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0); 
    if (buf == (caddr_t)(-1)) return Z_ERRNO;
    /* Compress the whole file at once: */
    len = gzwrite(out, (char *)buf, (unsigned)buf_len);
    if (len != (int)buf_len) error(gzerror(out, &err));
    munmap(buf, buf_len);
    fclose(in);
    if (gzclose(out) != Z_OK) error("failed gzclose");
    return Z_OK;
 }
 #endif /* USE_MMAP */
 /* ===========================================================================
 * Uncompress input to output then close both files.
 */
@@ -124,8 +189,9 @@ void gz_uncompress(in, out)
 * Compress the given file: create a corresponding .gz file and remove the
 * original.
 */
-void file_compress(file)
+void file_compress(file, mode)
    char  *file;
    char  *mode;
 {
    local char outfile[MAX_NAME_LEN];
    FILE  *in;
@@ -139,7 +205,7 @@ void file_compress(file)
        perror(file);
        exit(1);
    }
-    out = gzopen(outfile, "wb"); /* use "wb9" for maximal compression */
+    out = gzopen(outfile, mode);
    if (out == NULL) {
        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
        exit(1);
@@ -191,7 +257,11 @@ void file_uncompress(file)
 /* ===========================================================================
- * Usage:  minigzip [-d] [files...]
+ * Usage:  minigzip [-d] [-f] [-h] [-1 to -9] [files...]
 *   -d : decompress
 *   -f : compress with Z_FILTERED
 *   -h : compress with Z_HUFFMAN_ONLY
 *   -1 to -9 : compression level
 */
 int main(argc, argv)
@@ -200,15 +270,26 @@ int main(argc, argv)
 {
    int uncompr = 0;
    gzFile file;
    char outmode[20];
    strcpy(outmode, "wb6 ");
    prog = argv[0];
    argc--, argv++;
-    if (argc > 0) {
+    while (argc > 0) {
-        uncompr = (strcmp(*argv, "-d") == 0);
+      if (strcmp(*argv, "-d") == 0)
-        if (uncompr) {
+	uncompr = 1;
-            argc--, argv++;
+      else if (strcmp(*argv, "-f") == 0)
-        }
+	outmode[3] = 'f';
      else if (strcmp(*argv, "-h") == 0)
 	outmode[3] = 'h';
      else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' &&
 	       (*argv)[2] == 0)
 	outmode[2] = (*argv)[1];
      else
 	break;
      argc--, argv++;
    }
    if (argc == 0) {
        SET_BINARY_MODE(stdin);
@@ -218,7 +299,7 @@ int main(argc, argv)
            if (file == NULL) error("can't gzdopen stdin");
            gz_uncompress(file, stdout);
        } else {
-            file = gzdopen(fileno(stdout), "wb"); /* "wb9" for max compr. */
+            file = gzdopen(fileno(stdout), outmode);
            if (file == NULL) error("can't gzdopen stdout");
            gz_compress(stdin, file);
        }
@@ -227,7 +308,7 @@ int main(argc, argv)
            if (uncompr) {
                file_uncompress(*argv);
            } else {
-                file_compress(*argv);
+                file_compress(*argv, outmode);
            }
        } while (argv++, --argc);
    }
--- a/msdos/Makefile.b32
+++ b/msdos/Makefile.b32
@@ -0,0 +1,104 @@
 # Makefile for zlib
 # Borland C++   
 # This version of the zlib makefile was adapted by Chris Young for use
 # with Borland C 4.5x with the Dos Power Pack for a 32-bit protected mode
 # flat memory model.  It was created for use with POV-Ray ray tracer and
 # you may choose to edit the CFLAGS to suit your needs but the
 # switches -WX and -DMSDOS are required.
 # -- Chris Young 76702.1655@compuserve.com
 # To use, do "make -fmakefile.b32"
 # See zconf.h for details about the memory requirements.
 # ------------- Borland C++ -------------
 MODEL=-WX 
 CFLAGS= $(MODEL) -P-C -K -N- -k- -d -3 -r- -v- -f -DMSDOS
 CC=bcc32
 LD=bcc32
 LIB=tlib
 LDFLAGS= $(MODEL)
 O=.obj
 # variables
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
  trees$(O)
 OBJP1 = adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)+\
  trees$(O)
 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
  infutil$(O) inffast$(O)
 OBJP2 = zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)+\
  infutil$(O)+inffast$(O)
 all: test
 adler32.obj: adler32.c zutil.h zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
 compress.obj: compress.c zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
 crc32.obj: crc32.c zutil.h zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
 deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
 gzio.obj: gzio.c zutil.h zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
 infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
   infcodes.h infutil.h
 	$(CC) -c $(CFLAGS) $*.c
 infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
   infcodes.h inffast.h
 	$(CC) -c $(CFLAGS) $*.c
 inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
 	$(CC) -c $(CFLAGS) $*.c
 inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
 	$(CC) -c $(CFLAGS) $*.c
 infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
 	$(CC) -c $(CFLAGS) $*.c
 inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
 	$(CC) -c $(CFLAGS) $*.c
 trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
 uncompr.obj: uncompr.c zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
 zutil.obj: zutil.c zutil.h zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
 example.obj: example.c zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
 minigzip.obj: minigzip.c zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
 # 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)
 example.exe: example.obj zlib.lib
 	$(LD) $(LDFLAGS) example.obj zlib.lib
 minigzip.exe: minigzip.obj zlib.lib
 	$(LD) $(LDFLAGS) minigzip.obj zlib.lib
 test: example.exe minigzip.exe
 	example
 	echo hello world | minigzip | minigzip -d 
 #clean:
 #	del *.obj
 #	del *.exe
--- a/msdos/Makefile.bor
+++ b/msdos/Makefile.bor
--- a/msdos/Makefile.dj2
+++ b/msdos/Makefile.dj2
@@ -0,0 +1,100 @@
 # Makefile for zlib.  Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96.
 # Copyright (C) 1995-1998 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in zlib.h 
 # To compile, or to compile and test, type:
 # 
 #   make -fmakefile.dj2;  make test -fmakefile.dj2
 # 
 # To install libz.a, zconf.h and zlib.h in the djgpp directories, type:
 # 
 #    make install -fmakefile.dj2
 # 
 # after first defining LIBRARY_PATH and INCLUDE_PATH in djgpp.env as
 # in the sample below if the pattern of the DJGPP distribution is to
 # be followed.  Remember that, while <sp>'es around <=> are ignored in
 # makefiles, they are *not* in batch files or in djgpp.env.
 # - - - - -
 # [make]
 # INCLUDE_PATH=%\>;INCLUDE_PATH%%\DJDIR%\include
 # LIBRARY_PATH=%\>;LIBRARY_PATH%%\DJDIR%\lib
 # BUTT=-m486
 # - - - - -
 # Alternately, these variables may be defined below, overriding the values
 # in djgpp.env, as
 # INCLUDE_PATH=c:\usr\include
 # LIBRARY_PATH=c:\usr\lib
 CC=gcc
 #CFLAGS=-MMD -O
 #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 #CFLAGS=-MMD -g -DDEBUG
 CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
             -Wstrict-prototypes -Wmissing-prototypes
 # If cp.exe is available, replace "copy /Y" with "cp -fp" .
 CP=copy /Y
 # If gnu install.exe is available, replace $(CP) with ginstall.
 INSTALL=$(CP)
 # The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
 RM=del
 LDLIBS=-L. -lz
 LD=$(CC) -s -o
 LDSHARED=$(CC)
 INCL=zlib.h zconf.h
 LIBS=libz.a
 AR=ar rcs
 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
 TEST_OBJS = example.o minigzip.o
 all: example.exe minigzip.exe
 test: all
 	./example
 	echo hello world | .\minigzip | .\minigzip -d 
 %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 libz.a: $(OBJS)
 	$(AR) $@ $(OBJS)
 %.exe : %.o $(LIBS)
 	$(LD) $@ $< $(LDLIBS)
 # INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env .
 .PHONY : uninstall clean
 install: $(INCL) $(LIBS)
 	-@if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH)
 	-@if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH)
 	$(INSTALL) zlib.h $(INCLUDE_PATH)
 	$(INSTALL) zconf.h $(INCLUDE_PATH)
 	$(INSTALL) libz.a $(LIBRARY_PATH)
 uninstall:
 	$(RM) $(INCLUDE_PATH)\zlib.h
 	$(RM) $(INCLUDE_PATH)\zconf.h
 	$(RM) $(LIBRARY_PATH)\libz.a
 clean:
 	$(RM) *.d
 	$(RM) *.o
 	$(RM) *.exe
 	$(RM) libz.a
 	$(RM) foo.gz
 DEPS := $(wildcard *.d)
 ifneq ($(DEPS),)
 include $(DEPS)
 endif
--- a/msdos/Makefile.msc
+++ b/msdos/Makefile.msc
@@ -15,7 +15,7 @@ CFLAGS=-Oait -Gs -nologo -W3 $(MODEL)
 #-Ox generates bad code with MSC 5.1
 CC=cl
 LD=link
-LDFLAGS=/e/st:0x1000/noe
+LDFLAGS=/e/st:0x1500/noe
 O=.obj
 # variables
@@ -28,6 +28,8 @@ OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
 OBJP2 = zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)+\
  infutil$(O)+inffast$(O)
 all:  zlib.lib example.exe minigzip.exe
 adler32.obj: adler32.c zutil.h zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
@@ -80,7 +82,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
+	if exist zlib.lib del zlib.lib
 	lib zlib $(OBJ1);
 	lib zlib $(OBJ2);
--- a/msdos/Makefile.tc
+++ b/msdos/Makefile.tc
--- a/msdos/Makefile.w32
+++ b/msdos/Makefile.w32
@@ -0,0 +1,97 @@
 # Makefile for zlib
 # Microsoft 32-bit Visual C++ 4.0 or later (may work on earlier versions)
 # To use, do "nmake /f makefile.w32"
 # 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 Visual C++ 4.0 and later -------------
 MODEL=
 CFLAGS=-Ox -GA3s -nologo -W3
 CC=cl
 LD=link
 LDFLAGS=
 O=.obj
 # variables
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
  trees$(O)
 OBJP1 = adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)+\
  trees$(O)
 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
  infutil$(O) inffast$(O)
 OBJP2 = zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)+\
  infutil$(O)+inffast$(O)
 all:  zlib.lib example.exe minigzip.exe
 adler32.obj: adler32.c zutil.h zlib.h zconf.h
  $(CC) -c $(CFLAGS) $*.c
 compress.obj: compress.c zlib.h zconf.h
  $(CC) -c $(CFLAGS) $*.c
 crc32.obj: crc32.c zutil.h zlib.h zconf.h
  $(CC) -c $(CFLAGS) $*.c
 deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
  $(CC) -c $(CFLAGS) $*.c
 gzio.obj: gzio.c zutil.h zlib.h zconf.h
  $(CC) -c $(CFLAGS) $*.c
 infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
   infcodes.h infutil.h
  $(CC) -c $(CFLAGS) $*.c
 infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
   infcodes.h inffast.h
  $(CC) -c $(CFLAGS) $*.c
 inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
  $(CC) -c $(CFLAGS) $*.c
 inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
  $(CC) -c $(CFLAGS) $*.c
 infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
  $(CC) -c $(CFLAGS) $*.c
 inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
  $(CC) -c $(CFLAGS) $*.c
 trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
  $(CC) -c $(CFLAGS) $*.c
 uncompr.obj: uncompr.c zlib.h zconf.h
  $(CC) -c $(CFLAGS) $*.c
 zutil.obj: zutil.c zutil.h zlib.h zconf.h
  $(CC) -c $(CFLAGS) $*.c
 example.obj: example.c zlib.h zconf.h
  $(CC) -c $(CFLAGS) $*.c
 minigzip.obj: minigzip.c zlib.h zconf.h
  $(CC) -c $(CFLAGS) $*.c
 zlib.lib: $(OBJ1) $(OBJ2)
  if exist zlib.lib del zlib.lib
  lib /OUT:zlib.lib $(OBJ1) $(OBJ2)
 example.exe: example.obj zlib.lib
  $(LD) $(LDFLAGS) example.obj zlib.lib /OUT:example.exe /SUBSYSTEM:CONSOLE
 minigzip.exe: minigzip.obj zlib.lib
  $(LD) $(LDFLAGS) minigzip.obj zlib.lib /OUT:minigzip.exe /SUBSYSTEM:CONSOLE
 test: example.exe minigzip.exe
  example
  echo hello world | minigzip | minigzip -d 
 #clean:
 #  del *.obj
 #  del *.exe
--- a/msdos/Makefile.wat
+++ b/msdos/Makefile.wat
@@ -0,0 +1,103 @@
 # Makefile for zlib
 # Watcom 10a
 # This version of the zlib makefile was adapted by Chris Young for use
 # with Watcom 10a 32-bit protected mode flat memory model.  It was created 
 # for use with POV-Ray ray tracer and you may choose to edit the CFLAGS to 
 # suit your needs but the -DMSDOS is required.
 # -- Chris Young 76702.1655@compuserve.com
 # To use, do "wmake -f makefile.wat"
 # See zconf.h for details about the memory requirements.
 # ------------- Watcom 10a -------------
 MODEL=-mf 
 CFLAGS= $(MODEL) -fpi87 -fp5 -zp4 -5r -w5 -oneatx -DMSDOS
 CC=wcc386
 LD=wcl386
 LIB=wlib -b -c 
 LDFLAGS= 
 O=.obj
 # variables
 OBJ1=adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) 
 OBJ2=trees$(O) zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) 
 OBJ3=infutil$(O) inffast$(O)
 OBJP1=adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)
 OBJP2=trees$(O)+zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)
 OBJP3=infutil$(O)+inffast$(O)
 all: test
 adler32.obj: adler32.c zutil.h zlib.h zconf.h
 	$(CC) $(CFLAGS) $*.c
 compress.obj: compress.c zlib.h zconf.h
 	$(CC) $(CFLAGS) $*.c
 crc32.obj: crc32.c zutil.h zlib.h zconf.h
 	$(CC) $(CFLAGS) $*.c
 deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
 	$(CC) $(CFLAGS) $*.c
 gzio.obj: gzio.c zutil.h zlib.h zconf.h
 	$(CC) $(CFLAGS) $*.c
 infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h &
  infcodes.h infutil.h
 	$(CC) $(CFLAGS) $*.c
 infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h &
  infcodes.h inffast.h
 	$(CC) $(CFLAGS) $*.c
 inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
 	$(CC) $(CFLAGS) $*.c
 inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
 	$(CC) $(CFLAGS) $*.c
 infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
 	$(CC) $(CFLAGS) $*.c
 inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
 	$(CC) $(CFLAGS) $*.c
 trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
 	$(CC) $(CFLAGS) $*.c
 uncompr.obj: uncompr.c zlib.h zconf.h
 	$(CC) $(CFLAGS) $*.c
 zutil.obj: zutil.c zutil.h zlib.h zconf.h
 	$(CC) $(CFLAGS) $*.c
 example.obj: example.c zlib.h zconf.h
 	$(CC) $(CFLAGS) $*.c
 minigzip.obj: minigzip.c zlib.h zconf.h
 	$(CC) $(CFLAGS) $*.c
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2) $(OBJ3) 
 	del zlib.lib
 	$(LIB) zlib.lib +$(OBJP1)
 	$(LIB) zlib.lib +$(OBJP2)
 	$(LIB) zlib.lib +$(OBJP3)
 example.exe: example.obj zlib.lib
 	$(LD) $(LDFLAGS) example.obj zlib.lib
 minigzip.exe: minigzip.obj zlib.lib
 	$(LD) $(LDFLAGS) minigzip.obj zlib.lib
 test: minigzip.exe example.exe
 	example
 	echo hello world | minigzip | minigzip -d >test
 	type test
 #clean:
 #	del *.obj
 #	del *.exe
--- a/msdos/zlib.def
+++ b/msdos/zlib.def
@@ -0,0 +1,60 @@
 LIBRARY		"zlib"
 DESCRIPTION	'"""zlib data compression library"""'
 EXETYPE		NT
 SUBSYSTEM	WINDOWS
 STUB		'WINSTUB.EXE'
 VERSION		1.11
 CODE		 EXECUTE READ
 DATA		 READ WRITE
 HEAPSIZE	1048576,4096
 EXPORTS
    adler32                        @1
    compress                       @2
    crc32                          @3
    deflate                        @4
    deflateCopy                    @5
    deflateEnd                     @6
    deflateInit2_                  @7
    deflateInit_                   @8
    deflateParams                  @9
    deflateReset                   @10
    deflateSetDictionary           @11
    gzclose                        @12
    gzdopen                        @13
    gzerror                        @14
    gzflush                        @15
    gzopen                         @16
    gzread                         @17
    gzwrite                        @18
    inflate                        @19
    inflateEnd                     @20
    inflateInit2_                  @21
    inflateInit_                   @22
    inflateReset                   @23
    inflateSetDictionary           @24
    inflateSync                    @25
    uncompress                     @26
    zlibVersion                    @27
    gzprintf                       @28
    gzputc                         @29
    gzgetc                         @30
    gzseek                         @31
    gzrewind                       @32
    gztell                         @33
    gzeof                          @34
    gzsetparams                    @35
    zError                         @36
    inflateSyncPoint               @37
    get_crc_table                  @38
    compress2                      @39
    gzputs                         @40
    gzgets                         @41
--- a/msdos/zlib.rc
+++ b/msdos/zlib.rc
@@ -0,0 +1,32 @@
 #include <windows.h>
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
  FILEVERSION	 1,1,1,0
  PRODUCTVERSION 1,1,1,0
  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
  FILEFLAGS	0
  FILEOS	VOS_DOS_WINDOWS32
  FILETYPE	VFT_DLL
  FILESUBTYPE	0	// not used
 BEGIN
  BLOCK "StringFileInfo"
  BEGIN
    BLOCK "040904E4"
    //language ID = U.S. English, char set = Windows, Multilingual
    BEGIN
      VALUE "FileDescription", "zlib data compression library\0"
      VALUE "FileVersion",	"1.1.1\0"
      VALUE "InternalName",	"zlib\0"
      VALUE "OriginalFilename",	"zlib.dll\0"
      VALUE "ProductName",	"ZLib.DLL\0"
      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
      VALUE "LegalCopyright", "(C) 1995-1998 Jean-loup Gailly & Mark Adler\0"
    END
  END
  BLOCK "VarFileInfo"
  BEGIN
    VALUE "Translation", 0x0409, 1252
  END
 END
--- a/nt/Makefile.nt
+++ b/nt/Makefile.nt
@@ -0,0 +1,88 @@
 # Makefile for zlib
 !include <ntwin32.mak>
 CC=cl
 LD=link
 CFLAGS=-O -nologo
 LDFLAGS=
 O=.obj
 # variables
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
  trees$(O)
 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
  infutil$(O) inffast$(O)
 all:  zlib.dll example.exe minigzip.exe
 adler32.obj: adler32.c zutil.h zlib.h zconf.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 compress.obj: compress.c zlib.h zconf.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 crc32.obj: crc32.c zutil.h zlib.h zconf.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 gzio.obj: gzio.c zutil.h zlib.h zconf.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
   infcodes.h infutil.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
   infcodes.h inffast.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 uncompr.obj: uncompr.c zlib.h zconf.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 zutil.obj: zutil.c zutil.h zlib.h zconf.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 example.obj: example.c zlib.h zconf.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 minigzip.obj: minigzip.c zlib.h zconf.h
 	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
 zlib.dll: $(OBJ1) $(OBJ2) zlib.dnt
 	link $(dlllflags) -out:$@ -def:zlib.dnt $(OBJ1) $(OBJ2) $(guilibsdll)
 zlib.lib: zlib.dll
 example.exe: example.obj zlib.lib
 	$(LD) $(LDFLAGS) example.obj zlib.lib
 minigzip.exe: minigzip.obj zlib.lib
 	$(LD) $(LDFLAGS) minigzip.obj zlib.lib
 test: example.exe minigzip.exe
 	example
 	echo hello world | minigzip | minigzip -d 
 clean:
 	del *.obj
 	del *.exe
 	del *.dll
 	del *.lib
--- a/nt/zlib.dnt
+++ b/nt/zlib.dnt
@@ -0,0 +1,47 @@
 LIBRARY		zlib.dll
 EXETYPE WINDOWS
 CODE		 PRELOAD MOVEABLE DISCARDABLE
 DATA		 PRELOAD MOVEABLE MULTIPLE
 EXPORTS
    adler32                        @1
    compress                       @2
    crc32                          @3
    deflate                        @4
    deflateCopy                    @5
    deflateEnd                     @6
    deflateInit2_                  @7
    deflateInit_                   @8
    deflateParams                  @9
    deflateReset                   @10
    deflateSetDictionary           @11
    gzclose                        @12
    gzdopen                        @13
    gzerror                        @14
    gzflush                        @15
    gzopen                         @16
    gzread                         @17
    gzwrite                        @18
    inflate                        @19
    inflateEnd                     @20
    inflateInit2_                  @21
    inflateInit_                   @22
    inflateReset                   @23
    inflateSetDictionary           @24
    inflateSync                    @25
    uncompress                     @26
    zlibVersion                    @27
    gzprintf                       @28
    gzputc                         @29
    gzgetc                         @30
    gzseek                         @31
    gzrewind                       @32
    gztell                         @33
    gzeof                          @34
    gzsetparams                    @35
    zError                         @36
    inflateSyncPoint               @37
    get_crc_table                  @38
    compress2                      @39
    gzputs                         @40
    gzgets                         @41
--- a/trees.c
+++ b/trees.c
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-1996 Jean-loup Gailly
+ * Copyright (C) 1995-1998 Jean-loup Gailly
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
@@ -29,7 +29,9 @@
 *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
 */
-/* $Id: trees.c,v 1.5 1995/05/03 17:27:12 jloup Exp $ */
+/* @(#) $Id$ */
 /* #define GEN_TREES_H */
 #include "deflate.h"
@@ -56,16 +58,16 @@
 #define REPZ_11_138  18
 /* repeat a zero length 11-138 times  (7 bits of repeat count) */
-local int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
+local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
-local int extra_dbits[D_CODES] /* extra bits for each distance code */
+local const int extra_dbits[D_CODES] /* extra bits for each distance code */
   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-local int extra_blbits[BL_CODES]/* extra bits for each bit length code */
+local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
-local uch bl_order[BL_CODES]
+local const uch bl_order[BL_CODES]
   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
 /* The lengths of the bit length codes are sent in order of decreasing
 * probability, to avoid transmitting the lengths for unused bit length codes.
@@ -80,6 +82,11 @@ local uch bl_order[BL_CODES]
 * Local data. These are initialized only once.
 */
 #define DIST_CODE_LEN  512 /* see definition of array dist_code below */
 #if defined(GEN_TREES_H) || !defined(STDC)
 /* non ANSI compilers may not accept trees.h */
 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
@@ -92,13 +99,13 @@ local ct_data static_dtree[D_CODES];
 * 5 bits.)
 */
-local uch dist_code[512];
+uch _dist_code[DIST_CODE_LEN];
-/* distance codes. The first 256 values correspond to the distances
+/* Distance codes. The first 256 values correspond to the distances
 * 3 .. 258, the last 256 values correspond to the top 8 bits of
 * the 15 bit distances.
 */
-local uch length_code[MAX_MATCH-MIN_MATCH+1];
+uch _length_code[MAX_MATCH-MIN_MATCH+1];
 /* length code for each normalized match length (0 == MIN_MATCH) */
 local int base_length[LENGTH_CODES];
@@ -107,9 +114,13 @@ local int base_length[LENGTH_CODES];
 local int base_dist[D_CODES];
 /* First normalized distance for each code (0 = distance of 1) */
 #else
 #  include "trees.h"
 #endif /* GEN_TREES_H */
 struct static_tree_desc_s {
-    ct_data *static_tree;        /* static tree or NULL */
+    const ct_data *static_tree;  /* static tree or NULL */
-    intf    *extra_bits;         /* extra bits for each code or NULL */
+    const 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 */
@@ -122,7 +133,7 @@ local static_tree_desc  static_d_desc =
 {static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
 local static_tree_desc  static_bl_desc =
-{(ct_data *)0, extra_blbits, 0,      BL_CODES, MAX_BL_BITS};
+{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
 /* ===========================================================================
 * Local (static) routines in this file.
@@ -148,23 +159,20 @@ local void bi_flush       OF((deflate_state *s));
 local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
                              int header));
 #ifdef GEN_TREES_H
 local void gen_trees_header OF((void));
 #endif
 #ifndef DEBUG
 #  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
   /* Send a code of the given tree. c and tree must not have side effects */
 #else /* DEBUG */
 #  define send_code(s, c, tree) \
-     { if (verbose>1) fprintf(stderr,"\ncd %3d ",(c)); \
+     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
       send_bits(s, tree[c].Code, tree[c].Len); }
 #endif
 #define d_code(dist) \
   ((dist) < 256 ? dist_code[dist] : dist_code[256+((dist)>>7)])
 /* Mapping from a distance to a distance code. dist is the distance - 1 and
 * must not have side effects. dist_code[256] and dist_code[257] are never
 * used.
 */
 /* ===========================================================================
 * Output a short LSB first on the stream.
 * IN assertion: there is enough room in pendingBuf.
@@ -226,13 +234,12 @@ local void send_bits(s, value, length)
 /* the arguments must not have side effects */
 /* ===========================================================================
- * Initialize the various 'constant' tables. In a multi-threaded environment,
+ * Initialize the various 'constant' tables.
 * this function may be called by two threads concurrently, but this is
 * harmless since both invocations do exactly the same thing.
 */
 local void tr_static_init()
 {
-    static static_init_done = 0;
+#if defined(GEN_TREES_H) || !defined(STDC)
    static int static_init_done = 0;
    int n;        /* iterates over tree elements */
    int bits;     /* bit counter */
    int length;   /* length value */
@@ -248,7 +255,7 @@ local void tr_static_init()
    for (code = 0; code < LENGTH_CODES-1; code++) {
        base_length[code] = length;
        for (n = 0; n < (1<<extra_lbits[code]); n++) {
-            length_code[length++] = (uch)code;
+            _length_code[length++] = (uch)code;
        }
    }
    Assert (length == 256, "tr_static_init: length != 256");
@@ -256,14 +263,14 @@ local void tr_static_init()
     * in two different ways: code 284 + 5 bits or code 285, so we
     * overwrite length_code[255] to use the best encoding:
     */
-    length_code[length-1] = (uch)code;
+    _length_code[length-1] = (uch)code;
    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
    dist = 0;
    for (code = 0 ; code < 16; code++) {
        base_dist[code] = dist;
        for (n = 0; n < (1<<extra_dbits[code]); n++) {
-            dist_code[dist++] = (uch)code;
+            _dist_code[dist++] = (uch)code;
        }
    }
    Assert (dist == 256, "tr_static_init: dist != 256");
@@ -271,7 +278,7 @@ local void tr_static_init()
    for ( ; code < D_CODES; code++) {
        base_dist[code] = dist << 7;
        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-            dist_code[256 + dist++] = (uch)code;
+            _dist_code[256 + dist++] = (uch)code;
        }
    }
    Assert (dist == 256, "tr_static_init: 256+dist != 512");
@@ -295,8 +302,74 @@ local void tr_static_init()
        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
    }
    static_init_done = 1;
 #  ifdef GEN_TREES_H
    gen_trees_header();
 #  endif
 #endif /* defined(GEN_TREES_H) || !defined(STDC) */
 }
 /* ===========================================================================
 * Genererate the file trees.h describing the static trees.
 */
 #ifdef GEN_TREES_H
 #  ifndef DEBUG
 #    include <stdio.h>
 #  endif
 #  define SEPARATOR(i, last, width) \
      ((i) == (last)? "\n};\n\n" :    \
       ((i) % (width) == (width)-1 ? ",\n" : ", "))
 void gen_trees_header()
 {
    FILE *header = fopen("trees.h", "w");
    int i;
    Assert (header != NULL, "Can't open trees.h");
    fprintf(header,
 	    "/* header created automatically with -DGEN_TREES_H */\n\n");
    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
    for (i = 0; i < L_CODES+2; i++) {
 	fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
 		static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
    }
    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
    for (i = 0; i < D_CODES; i++) {
 	fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
 		static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
    }
    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
    for (i = 0; i < DIST_CODE_LEN; i++) {
 	fprintf(header, "%2u%s", _dist_code[i],
 		SEPARATOR(i, DIST_CODE_LEN-1, 20));
    }
    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
 	fprintf(header, "%2u%s", _length_code[i],
 		SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
    }
    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
    for (i = 0; i < LENGTH_CODES; i++) {
 	fprintf(header, "%1u%s", base_length[i],
 		SEPARATOR(i, LENGTH_CODES-1, 20));
    }
    fprintf(header, "local const int base_dist[D_CODES] = {\n");
    for (i = 0; i < D_CODES; i++) {
 	fprintf(header, "%5u%s", base_dist[i],
 		SEPARATOR(i, D_CODES-1, 10));
    }
    fclose(header);
 }
 #endif /* GEN_TREES_H */
 /* ===========================================================================
 * Initialize the tree data structures for a new zlib stream.
 */
@@ -413,12 +486,12 @@ local void gen_bitlen(s, desc)
    deflate_state *s;
    tree_desc *desc;    /* the tree descriptor */
 {
-    ct_data *tree  = desc->dyn_tree;
+    ct_data *tree        = desc->dyn_tree;
-    int max_code   = desc->max_code;
+    int max_code         = desc->max_code;
-    ct_data *stree = desc->stat_desc->static_tree;
+    const ct_data *stree = desc->stat_desc->static_tree;
-    intf *extra    = desc->stat_desc->extra_bits;
+    const intf *extra    = desc->stat_desc->extra_bits;
-    int base       = desc->stat_desc->extra_base;
+    int base             = desc->stat_desc->extra_base;
-    int max_length = desc->stat_desc->max_length;
+    int max_length       = desc->stat_desc->max_length;
    int h;              /* heap index */
    int n, m;           /* iterate over the tree elements */
    int bits;           /* bit length */
@@ -542,9 +615,9 @@ local void build_tree(s, desc)
    deflate_state *s;
    tree_desc *desc; /* the tree descriptor */
 {
-    ct_data *tree   = desc->dyn_tree;
+    ct_data *tree         = desc->dyn_tree;
-    ct_data *stree  = desc->stat_desc->static_tree;
+    const ct_data *stree  = desc->stat_desc->static_tree;
-    int elems       = desc->stat_desc->elems;
+    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;          /* new node being created */
@@ -965,12 +1038,13 @@ int _tr_tally (s, dist, lc)
               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
-        s->dyn_ltree[length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
        s->dyn_dtree[d_code(dist)].Freq++;
    }
 #ifdef TRUNCATE_BLOCK
    /* Try to guess if it is profitable to stop the current block here */
-    if (s->level > 2 && (s->last_lit & 0xfff) == 0) {
+    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
        /* Compute an upper bound for the compressed length */
        ulg out_length = (ulg)s->last_lit*8L;
        ulg in_length = (ulg)((long)s->strstart - s->block_start);
@@ -985,6 +1059,7 @@ int _tr_tally (s, dist, lc)
               100L - out_length*100L/in_length));
        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
    }
 #endif
    return (s->last_lit == s->lit_bufsize-1);
    /* We avoid equality with lit_bufsize because of wraparound at 64K
     * on 16 bit machines and because stored blocks are restricted to
@@ -1014,7 +1089,7 @@ local void compress_block(s, ltree, dtree)
            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
        } else {
            /* Here, lc is the match length - MIN_MATCH */
-            code = length_code[lc];
+            code = _length_code[lc];
            send_code(s, code+LITERALS+1, ltree); /* send the length code */
            extra = extra_lbits[code];
            if (extra != 0) {
--- a/trees.h
+++ b/trees.h
@@ -0,0 +1,128 @@
 /* header created automatically with -DGEN_TREES_H */
 local const ct_data static_ltree[L_CODES+2] = {
 {{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
 {{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
 {{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
 {{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
 {{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
 {{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
 {{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
 {{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
 {{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
 {{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
 {{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
 {{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
 {{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
 {{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
 {{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
 {{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
 {{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
 {{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
 {{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
 {{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
 {{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
 {{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
 {{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
 {{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
 {{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
 {{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
 {{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
 {{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
 {{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
 {{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
 {{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
 {{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
 {{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
 {{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
 {{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
 {{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
 {{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
 {{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
 {{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
 {{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
 {{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
 {{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
 {{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
 {{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
 {{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
 {{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
 {{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
 {{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
 {{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
 {{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
 {{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
 {{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
 {{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
 {{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
 {{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
 {{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
 {{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
 {{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
 };
 local const ct_data static_dtree[D_CODES] = {
 {{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
 {{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
 {{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
 {{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
 {{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
 {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
 };
 const uch _dist_code[DIST_CODE_LEN] = {
 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
 18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
 };
 const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
 };
 local const int base_length[LENGTH_CODES] = {
 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
 64, 80, 96, 112, 128, 160, 192, 224, 0
 };
 local const int base_dist[D_CODES] = {
    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
 };
--- a/uncompr.c
+++ b/uncompr.c
@@ -1,9 +1,9 @@
 /* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-1996 Jean-loup Gailly.
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
-/* $Id: uncompr.c,v 1.5 1995/05/03 17:27:12 jloup Exp $ */
+/* @(#) $Id$ */
 #include "zlib.h"
@@ -22,7 +22,7 @@
   enough memory, Z_BUF_ERROR if there was not enough room in the output
   buffer, or Z_DATA_ERROR if the input data was corrupted.
 */
-int uncompress (dest, destLen, source, sourceLen)
+int ZEXPORT uncompress (dest, destLen, source, sourceLen)
    Bytef *dest;
    uLongf *destLen;
    const Bytef *source;
@@ -49,7 +49,7 @@ int uncompress (dest, destLen, source, sourceLen)
    err = inflate(&stream, Z_FINISH);
    if (err != Z_STREAM_END) {
        inflateEnd(&stream);
-        return err;
+        return err == Z_OK ? Z_BUF_ERROR : err;
    }
    *destLen = stream.total_out;
--- a/zconf.h
+++ b/zconf.h
@@ -1,16 +1,16 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-1996 Jean-loup Gailly.
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
-/* $Id: zconf.h,v 1.12 1995/05/03 17:27:12 jloup Exp $ */
+/* @(#) $Id$ */
 #ifndef _ZCONF_H
 #define _ZCONF_H
 /*
- * People prefering a unique prefix for all types and library functions
+ * If you *really* need a unique prefix for all types and library functions,
- * should compile with -DZ_PREFIX
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
 */
 #ifdef Z_PREFIX
 #  define deflateInit_	z_deflateInit_
@@ -20,13 +20,17 @@
 #  define inflate	z_inflate
 #  define inflateEnd	z_inflateEnd
 #  define deflateInit2_	z_deflateInit2_
 #  define deflateSetDictionary z_deflateSetDictionary
 #  define deflateCopy	z_deflateCopy
 #  define deflateReset	z_deflateReset
 #  define deflateParams	z_deflateParams
 #  define inflateInit2_	z_inflateInit2_
 #  define inflateSetDictionary z_inflateSetDictionary
 #  define inflateSync	z_inflateSync
 #  define inflateSyncPoint z_inflateSyncPoint
 #  define inflateReset	z_inflateReset
 #  define compress	z_compress
 #  define compress2	z_compress2
 #  define uncompress	z_uncompress
 #  define adler32	z_adler32
 #  define crc32		z_crc32
@@ -35,7 +39,7 @@
 #  define Byte		z_Byte
 #  define uInt		z_uInt
 #  define uLong		z_uLong
-#  define Bytef		z_Bytef
+#  define Bytef	        z_Bytef
 #  define charf		z_charf
 #  define intf		z_intf
 #  define uIntf		z_uIntf
@@ -47,8 +51,10 @@
 #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
 #  define WIN32
 #endif
-#if (defined(__GNUC__) || defined(WIN32)) && !defined(__32BIT__)
+#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
-#  define __32BIT__
+#  ifndef __32BIT__
 #    define __32BIT__
 #  endif
 #endif
 #if defined(__MSDOS__) && !defined(MSDOS)
 #  define MSDOS
@@ -68,19 +74,29 @@
 #if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
 #  define STDC
 #endif
-#if (defined(__STDC__) || defined(__cplusplus)) && !defined(STDC)
+#if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)
-#  define STDC
+#  ifndef STDC
 #    define STDC
 #  endif
 #endif
-#if !defined(STDC) && !defined(const)
+#ifndef STDC
-#  define const
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
 #    define const
 #  endif
 #endif
-#ifdef	__MWERKS__ /* Metrowerks CodeWarrior declares fileno() in unix.h */
+/* Some Mac compilers merge all .h files incorrectly: */
-#  include <unix.h>
+#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
-#  define Byte _Byte /* Byte already used on Mac */
+#  define NO_DUMMY_DECL
 #endif
 /* Borland C incorrectly complains about missing returns: */
 #if defined(__BORLANDC__)
 #  define NEED_DUMMY_RETURN
 #endif
 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL
 #  ifdef MAXSEG_64K
@@ -90,13 +106,17 @@
 #  endif
 #endif
-/* Maximum value for windowBits in deflateInit2 and inflateInit2 */
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
 * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
 * created by gzip. (Files created by minigzip can still be extracted by
 * gzip.)
 */
 #ifndef MAX_WBITS
 #  define MAX_WBITS   15 /* 32K LZ77 window */
 #endif
 /* The memory requirements for deflate are (in bytes):
-            1 << (windowBits+2)   +  1 << (memLevel+9)
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
 that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
 plus a few kilobytes for small objects. For example, if you want to reduce
 the default memory requirements from 256K to 128K, compile with
@@ -124,7 +144,8 @@
 * 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 */
+#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__)
   /* MSC small or medium model */
 #  define SMALL_MEDIUM
 #  ifdef _MSC_VER
 #    define FAR __far
@@ -133,23 +154,48 @@
 #  endif
 #endif
 #if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
 #  ifndef __32BIT__
 #    define SMALL_MEDIUM
 #    define FAR __far
 #  endif
 #endif
 /* Compile with -DZLIB_DLL for Windows DLL support */
 #if (defined(_WINDOWS) || defined(WINDOWS)) && defined(ZLIB_DLL)
 #  ifdef FAR
 #    undef FAR
 #  endif
 #  include <windows.h>
 #  define ZEXPORT  WINAPI
 #  ifdef WIN32
 #    define ZEXPORTVA  WINAPIV
 #  else
 #    define ZEXPORTVA  FAR _cdecl _export
 #  endif
 #else
 #   if defined (__BORLANDC__) && defined (_Windows) && defined (__DLL__)
 #       define ZEXPORT _export
 #       define ZEXPORTVA _export
 #   else
 #       define ZEXPORT
 #       define ZEXPORTVA
 #   endif
 #endif
 #ifndef FAR
 #   define FAR
 #endif
 /* The Watcom compiler defines M_I86SM and __SMALL__ even in 32 bit mode */
 #if defined(__WATCOMC__) && defined(__386__)
 #  undef FAR
 #  undef SMALL_MEDIUM
 #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;
+#if defined(__BORLANDC__) && defined(SMALL_MEDIUM)
   /* Borland C/C++ ignores FAR inside typedef */
 #  define Bytef Byte FAR
 #else
   typedef Byte  FAR Bytef;
 #endif
 typedef char  FAR charf;
 typedef int   FAR intf;
 typedef uInt  FAR uIntf;
@@ -163,4 +209,44 @@ typedef uLong FAR uLongf;
   typedef Byte     *voidp;
 #endif
 #ifdef HAVE_UNISTD_H
 #  include <sys/types.h> /* for off_t */
 #  include <unistd.h>    /* for SEEK_* and off_t */
 #  define z_off_t  off_t
 #endif
 #ifndef SEEK_SET
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */
 #endif
 #ifndef z_off_t
 #  define  z_off_t long
 #endif
 /* MVS linker does not support external names larger than 8 bytes */
 #if defined(__MVS__)
 #   pragma map(deflateInit_,"DEIN")
 #   pragma map(deflateInit2_,"DEIN2")
 #   pragma map(deflateEnd,"DEEND")
 #   pragma map(inflateInit_,"ININ")
 #   pragma map(inflateInit2_,"ININ2")
 #   pragma map(inflateEnd,"INEND")
 #   pragma map(inflateSync,"INSY")
 #   pragma map(inflateSetDictionary,"INSEDI")
 #   pragma map(inflate_blocks,"INBL")
 #   pragma map(inflate_blocks_new,"INBLNE")
 #   pragma map(inflate_blocks_free,"INBLFR")
 #   pragma map(inflate_blocks_reset,"INBLRE")
 #   pragma map(inflate_codes_free,"INCOFR")
 #   pragma map(inflate_codes,"INCO")
 #   pragma map(inflate_fast,"INFA")
 #   pragma map(inflate_flush,"INFLU")
 #   pragma map(inflate_mask,"INMA")
 #   pragma map(inflate_set_dictionary,"INSEDI2")
 #   pragma map(inflate_copyright,"INCOPY")
 #   pragma map(inflate_trees_bits,"INTRBI")
 #   pragma map(inflate_trees_dynamic,"INTRDY")
 #   pragma map(inflate_trees_fixed,"INTRFI")
 #   pragma map(inflate_trees_free,"INTRFR")
 #endif
 #endif /* _ZCONF_H */
--- a/zlib.3
+++ b/zlib.3
@@ -0,0 +1,107 @@
 .TH ZLIB 3 "27 February 1998"
 .SH NAME
 zlib \- compression/decompression library
 .SH SYNOPSIS
 [see
 .I zlib.h
 for full description]
 .SH DESCRIPTION
 The
 .I zlib
 library is a general purpose data compression library.
 The code is thread safe.
 It provides in-memory compression and decompression functions,
 including integrity checks of the uncompressed data.
 This version of the library supports only one compression method (deflation)
 but other algorithms will be added later and will have the same stream interface.
 .LP
 Compression can be done in a single step if the buffers are large enough
 (for example if an input file is mmap'ed),
 or can be done by repeated calls of the compression function.
 In the latter case,
 the application must provide more input and/or consume the output
 (providing more output space) before each call.
 .LP
 The library also supports reading and writing files in
 .I gzip
 (.gz) format
 with an interface similar to that of stdio.
 .LP
 The library does not install any signal handler. The decoder checks
 the consistency of the compressed data, so the library should never
 crash even in case of corrupted input.
 .LP
 All functions of the compression library are documented in the file
 .IR zlib.h.
 The distribution source includes examples of use of the library
 the files
 .I example.c
 and
 .IR minigzip.c .
 .LP
 A Java implementation of
 .IR zlib
 is available in the Java Development Kit 1.1
 .IP
 http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html
 .LP
 A Perl interface to
 .IR zlib ,
 written by Paul Marquess (pmarquess@bfsec.bt.co.uk)
 is available at CPAN (Comprehensive Perl Archive Network) sites,
 such as:
 .IP
 ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Compress/Compress-Zlib*
 .LP
 A Python interface to
 .IR zlib
 written by A.M. Kuchling <amk@magnet.com>
 is available from the Python Software Association sites, such as:
 .IP
 ftp://ftp.python.org/pub/python/contrib/Encoding/zlib*.tar.gz
 .SH "SEE ALSO"
 Questions about zlib should be sent to:
 .IP
 zlib@quest.jpl.nasa.gov
 or, if this fails, to the author addresses given below.
 The zlib home page is:
 .IP
 http://www.cdrom.com/pub/infozip/zlib/
 .LP
 The data format used by the zlib library is described by RFC
 (Request for Comments) 1950 to 1952 in the files: 
 .IP
 ftp://ds.internic.net/rfc/rfc1950.txt (zlib format)
 .br
 rfc1951.txt (deflate format)
 .br
 rfc1952.txt (gzip format)
 .LP
 These documents are also available in other formats from:
 .IP
 ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
 .SH AUTHORS
 Version 1.1.1
 Copyright (C) 1995-1998 Jean-loup Gailly (jloup@gzip.org)
 and Mark Adler (madler@alumni.caltech.edu).
 .LP
 This software is provided "as-is,"
 without any express or implied warranty.
 In no event will the authors be held liable for any damages
 arising from the use of this software.
 See the distribution directory with respect to requirements
 governing redistribution.
 The deflate format used by
 .I zlib
 was defined by Phil Katz.
 The deflate and
 .I zlib
 specifications were written by Peter Deutsch.
 Thanks to all the people who reported problems and suggested various
 improvements in
 .IR zlib ;
 who are too numerous to cite here.
 .LP
 UNIX manual page by R. P. C. Rodgers,
 U.S. National Library of Medicine (rodgers@nlm.nih.gov).
 .\" end of man page
--- a/zlib.h
+++ b/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.0, Jan 27th, 1996.
+  version 1.1.1, Feb 27th, 1998
-  Copyright (C) 1995-1996 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-1998 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
@@ -20,8 +20,13 @@
  3. This notice may not be removed or altered from any source distribution.
  Jean-loup Gailly        Mark Adler
-  gzip@prep.ai.mit.edu    madler@alumni.caltech.edu
+  jloup@gzip.org          madler@alumni.caltech.edu
- */
+
  The data format used by the zlib library is described by RFCs (Request for
  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
 */
 #ifndef _ZLIB_H
 #define _ZLIB_H
@@ -32,30 +37,27 @@ extern "C" {
 #include "zconf.h"
-#define ZLIB_VERSION "1.0"
+#define ZLIB_VERSION "1.1.1"
 /* 
     The 'zlib' compression library provides in-memory compression and
  decompression functions, including integrity checks of the uncompressed
  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms may be added later and will have the same
+  (deflation) but other algorithms will be added later and will have the same
  stream interface.
     For compression the application must provide the output buffer and
  may optionally provide the input buffer for optimization. For decompression,
  the application must provide the input buffer and may optionally provide
  the output buffer for optimization.
     Compression can be done in a single step if the buffers are large
  enough (for example if an input file is mmap'ed), or can be done by
  repeated calls of the compression function.  In the latter case, the
  application must provide more input and/or consume the output
  (providing more output space) before each call.
-     The library does not install any signal handler. It is recommended to
+     The library also supports reading and writing files in gzip (.gz) format
-  add at least a handler for SIGSEGV when decompressing; the library checks
+  with an interface similar to that of stdio.
-  the consistency of the input data whenever possible but may go nuts
+
-  for some forms of corrupted input.
+     The library does not install any signal handler. The decoder checks
  the consistency of the compressed data, so the library should never
  crash even in case of corrupted input.
 */
 typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
@@ -84,6 +86,8 @@ typedef struct z_stream_s {
    uLong   reserved;   /* reserved for future use */
 } z_stream;
 typedef z_stream FAR *z_streamp;
 /*
   The application must update next_in and avail_in when avail_in has
   dropped to zero. It must update next_out and avail_out when avail_out
@@ -97,6 +101,9 @@ typedef struct z_stream_s {
   opaque value.
   zalloc must return Z_NULL if there is not enough memory for the object.
   If zlib is used in a multi-threaded application, zalloc and zfree must be
   thread safe.
   On 16-bit systems, the functions zalloc and zfree must be able to allocate
   exactly 65536 bytes, but will not be required to allocate more than this
   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
@@ -116,7 +123,7 @@ typedef struct z_stream_s {
                        /* constants */
 #define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
+#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
 #define Z_SYNC_FLUSH    2
 #define Z_FULL_FLUSH    3
 #define Z_FINISH        4
@@ -156,16 +163,20 @@ typedef struct z_stream_s {
 #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-extern const char *zlib_version;
+#define zlib_version zlibVersion()
-/* The application can compare zlib_version and ZLIB_VERSION for consistency.
+/* for compatibility with versions < 1.0.2 */
   If the first character differs, the library code actually used is
   not compatible with the zlib.h header file used by the application.
 */
                        /* basic functions */
 extern const char * ZEXPORT zlibVersion OF((void));
 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
   If the first character differs, the library code actually used is
   not compatible with the zlib.h header file used by the application.
   This check is automatically made by deflateInit and inflateInit.
 */
 /* 
-extern int deflateInit OF((z_stream *strm, int level));
+extern int ZEXPORT deflateInit OF((z_streamp strm, int level));
     Initializes the internal stream state for compression. The fields
   zalloc, zfree and opaque must be initialized before by the caller.
@@ -187,9 +198,15 @@ extern int deflateInit OF((z_stream *strm, int level));
 */
-extern int deflate OF((z_stream *strm, int flush));
+extern int ZEXPORT deflate OF((z_streamp strm, int flush));
 /*
-  Performs one or both of the following actions:
+    deflate compresses as much data as possible, and stops when the input
  buffer becomes empty or the output buffer becomes full. It may introduce some
  output latency (reading input without producing any output) except when
  forced to flush.
    The detailed semantics are as follows. deflate performs one or both of the
  following actions:
  - Compress more input starting at next_in and update next_in and avail_in
    accordingly. If not all input can be processed (because there is not
@@ -207,29 +224,30 @@ extern int deflate OF((z_stream *strm, int flush));
  more output, and updating avail_in or avail_out accordingly; avail_out
  should never be zero before the call. The application can consume the
  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate().
+  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
  and with zero avail_out, it must be called again after making room in the
  output buffer because there might be more output pending.
-    If the parameter flush is set to Z_PARTIAL_FLUSH, the current compression
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  block is terminated and flushed to the output buffer so that the
+  flushed to the output buffer and the output is aligned on a byte boundary, so
-  decompressor can get all input data available so far. For method 9, a future
+  that the decompressor can get all input data available so far. (In particular
-  variant on method 8, the current block will be flushed but not terminated.
+  avail_in is zero after the call if enough output space has been provided
-  Z_SYNC_FLUSH has the same effect as partial flush except that the compressed
+  before the call.)  Flushing may degrade compression for some compression
-  output is byte aligned (the compressor can clear its internal bit buffer)
+  algorithms and so it should be used only when necessary.
  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. 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,
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  all pending output is flushed and deflate returns with Z_STREAM_END if there
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
  restart from this point if previous compressed data has been damaged or if
  random access is desired. Using Z_FULL_FLUSH too often can 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, pending input is processed,
  pending output is flushed and deflate returns with Z_STREAM_END if there
  was enough output space; if deflate returns with Z_OK, this function must be
  called again with Z_FINISH and more output space (updated avail_out) but no
  more input data, until it returns with Z_STREAM_END or an error. After
@@ -241,6 +259,9 @@ extern int deflate OF((z_stream *strm, int flush));
  0.1% larger than avail_in plus 12 bytes.  If deflate does not return
  Z_STREAM_END, then it must be called again as described above.
    deflate() sets strm->adler to the adler32 checksum of all input read
  so far (that is, total_in bytes).
    deflate() may update data_type if it can make a good guess about
  the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
  binary. This field is only for information purposes and does not affect
@@ -254,7 +275,7 @@ extern int deflate OF((z_stream *strm, int flush));
 */
-extern int deflateEnd OF((z_stream *strm));
+extern int ZEXPORT deflateEnd OF((z_streamp strm));
 /*
     All dynamically allocated data structures for this stream are freed.
   This function discards any unprocessed input and does not flush any
@@ -269,24 +290,35 @@ extern int deflateEnd OF((z_stream *strm));
 /* 
-extern int inflateInit OF((z_stream *strm));
+extern int ZEXPORT inflateInit OF((z_streamp strm));
     Initializes the internal stream state for decompression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   zalloc and zfree are set to Z_NULL, inflateInit updates them to use default
+   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   allocation functions.
+   value depends on the compression method), inflateInit determines the
   compression method from the zlib header and allocates all data structures
   accordingly; otherwise the allocation will be deferred to the first call of
   inflate.  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
+     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   enough memory, Z_VERSION_ERROR if the zlib library version is incompatible
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   with the version assumed by the caller.  msg is set to null if there is no
+   version assumed by the caller.  msg is set to null if there is no error
-   error message. inflateInit does not perform any decompression: this will be
+   message. inflateInit does not perform any decompression apart from reading
-   done by inflate().
+   the zlib header if present: this will be done by inflate().  (So next_in and
   avail_in may be modified, but next_out and avail_out are unchanged.)
 */
-extern int inflate OF((z_stream *strm, int flush));
+extern int ZEXPORT inflate OF((z_streamp strm, int flush));
 /*
-  Performs one or both of the following actions:
+    inflate decompresses as much data as possible, and stops when the input
  buffer becomes empty or the output buffer becomes full. It may some
  introduce some output latency (reading input without producing any output)
  except when forced to flush.
  The detailed semantics are as follows. inflate performs one or both of the
  following actions:
  - Decompress more input starting at next_in and update next_in and avail_in
    accordingly. If not all input can be processed (because there is not
@@ -294,19 +326,22 @@ extern int inflate OF((z_stream *strm, int flush));
    will resume at this point for the next call of inflate().
  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() always provides as much output as possible
+    accordingly.  inflate() provides as much output as possible, until there
-    (until there is no more input data or no more space in the output buffer).
+    is no more input data or no more space in the output buffer (see below
    about the flush parameter).
  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
  more output, and updating the next_* and avail_* values accordingly.
  The application can consume the uncompressed output when it wants, for
  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate().
+  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
  must be called again after making room in the output buffer because there
  might be more output pending.
-    If the parameter flush is set to Z_PARTIAL_FLUSH, inflate flushes as much
+    If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much
  output as possible to the output buffer. The flushing behavior of inflate is
-  not specified for values of the flush parameter other than Z_PARTIAL_FLUSH
+  not specified for values of the flush parameter other than Z_SYNC_FLUSH
  and Z_FINISH, but the current implementation actually flushes as much output
  as possible anyway.
@@ -321,22 +356,30 @@ extern int inflate OF((z_stream *strm, int flush));
  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
+     If a preset dictionary is needed at this point (see inflateSetDictionary
-  processed or more output produced), Z_STREAM_END if the end of the
+  below), inflate sets strm-adler to the adler32 checksum of the
-  compressed data has been reached and all uncompressed output has been
+  dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise 
-  produced, Z_NEED_DICT if a preset dictionary is needed at this point (see
+  it sets strm->adler to the adler32 checksum of all output produced
-  inflateSetDictionary below), Z_DATA_ERROR if the input data was corrupted,
+  so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or
-  Z_STREAM_ERROR if the stream structure was inconsistent (for example if
+  an error code as described below. At the end of the stream, inflate()
-  next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
+  checks that its computed adler32 checksum is equal to that saved by the
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in
+  compressor and returns Z_STREAM_END only if the checksum is correct.
-  the output buffer when Z_FINISH is used. In the Z_DATA_ERROR case, the
+
-  application may then call inflateSync to look for a good compression block.
+    inflate() returns Z_OK if some progress has been made (more input processed
-  In the Z_NEED_DICT case, strm->adler is set to the Adler32 value of the
+  or more output produced), Z_STREAM_END if the end of the compressed data has
-  dictionary chosen by the compressor.
+  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
  corrupted (input stream not conforming to the zlib format or incorrect
  adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent
  (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not
  enough memory, Z_BUF_ERROR if no progress is possible or if there was not
  enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR
  case, the application may then call inflateSync to look for a good
  compression block.
 */
-extern int inflateEnd OF((z_stream *strm));
+extern int ZEXPORT inflateEnd OF((z_streamp strm));
 /*
     All dynamically allocated data structures for this stream are freed.
   This function discards any unprocessed input and does not flush any
@@ -354,26 +397,25 @@ extern int inflateEnd OF((z_stream *strm));
 */
 /*   
-extern int deflateInit2 OF((z_stream *strm,
+extern int ZEXPORT deflateInit2 OF((z_streamp strm,
-                            int  level,
+                                    int  level,
-                            int  method,
+                                    int  method,
-                            int  windowBits,
+                                    int  windowBits,
-                            int  memLevel,
+                                    int  memLevel,
-                            int  strategy));
+                                    int  strategy));
     This is another version of deflateInit with more compression options. The
   fields next_in, zalloc, zfree and opaque must be initialized before by
   the caller.
     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
+   this version of the library.
   partial block flushes.)
     The windowBits parameter is the base two logarithm of the window size
   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library (the value 16 will be allowed for method 9). Larger
+   version of the library. Larger values of this parameter result in better
-   values of this parameter result in better compression at the expense of
+   compression at the expense of memory usage. The default value is 15 if
-   memory usage. The default value is 15 if deflateInit is used instead.
+   deflateInit is used instead.
     The memLevel parameter specifies how much memory should be allocated
   for the internal compression state. memLevel=1 uses minimum memory but
@@ -392,42 +434,35 @@ extern int deflateInit2 OF((z_stream *strm,
   the compression ratio but not the correctness of the compressed output even
   if it is not set appropriately.
-     If next_in is not null, the library will use this buffer to hold also
+      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   some history information; the buffer must either hold the entire input
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   data, or have at least 1<<(windowBits+1) bytes and be writable. If next_in
+   method). msg is set to null if there is no error message.  deflateInit2 does
-   is null, the library will allocate its own history buffer (and leave next_in
+   not perform any compression: this will be done by deflate().
   null). next_out need not be provided here but must be provided by the
   application for the next call of deflate().
     If the history buffer is provided by the application, next_in must
   must never be changed by the application since the compressor maintains
   information inside this buffer from call to call; the application
   must provide more input only by increasing avail_in. next_in is always
   reset by the library in this case.
      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was
   not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as
   an invalid method). msg is set to null if there is no error message.
   deflateInit2 does not perform any compression: this will be done by
   deflate(). 
 */
-extern int deflateSetDictionary OF((z_stream *strm,
+extern int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-				    const Bytef *dictionary,
+                                            const Bytef *dictionary,
-				    uInt  dictLength));
+                                            uInt  dictLength));
 /*
-     Initializes the compression dictionary (history buffer) from the given
+     Initializes the compression dictionary from the given byte sequence
-   byte sequence without producing any compressed output. This function must
+   without producing any compressed output. This function must be called
-   be called immediately after deflateInit or deflateInit2, before any call
+   immediately after deflateInit or deflateInit2, before any call of
-   of deflate. The compressor and decompressor must use exactly the same
+   deflate. The compressor and decompressor must use exactly the same
   dictionary (see inflateSetDictionary).
     The dictionary should consist of strings (byte sequences) that are likely
   to be encountered later in the data to be compressed, with the most commonly
   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and
+   dictionary is most useful when the data to be compressed is short and can be
-   can be predicted with good accuracy; the data can then be compressed better
+   predicted with good accuracy; the data can then be compressed better than
-   than with the default empty dictionary. In this version of the library,
+   with the default empty dictionary.
-   only the last 32K bytes of the dictionary are used.
+
     Depending on the size of the compression data structures selected by
   deflateInit or deflateInit2, a part of the dictionary may in effect be
   discarded, for example if the dictionary is larger than the window size in
   deflate or deflate2. Thus the strings most likely to be useful should be
   put at the end of the dictionary, not at the front.
     Upon return of this function, strm->adler is set to the Adler32 value
   of the dictionary; the decompressor may later use this value to determine
   which dictionary has been used by the compressor. (The Adler32 value
@@ -435,21 +470,16 @@ extern int deflateSetDictionary OF((z_stream *strm,
   actually used by the compressor.)
     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state
+   parameter is invalid (such as NULL dictionary) or the stream state is
-   is inconsistent (for example if deflate has already been called for this
+   inconsistent (for example if deflate has already been called for this stream
-   stream). deflateSetDictionary does not perform any compression: this will
+   or if the compression method is bsort). deflateSetDictionary does not
-   be done by deflate(). 
+   perform any compression: this will be done by deflate().
 */
-extern int deflateCopy OF((z_stream *dest,
+extern int ZEXPORT deflateCopy OF((z_streamp dest,
-                           z_stream *source));
+                                   z_streamp source));
 /*
-     Sets the destination stream as a complete copy of the source stream.  If
+     Sets the destination stream as a complete copy of the source stream.
   the source stream is using an application-supplied history buffer, a new
   buffer is allocated for the destination stream.  The compressed output
   buffer is always application-supplied. It's the responsibility of the
   application to provide the correct values of next_out and avail_out for the
   next call of deflate.
     This function can be useful when several compression strategies will be
   tried, for example when there are several ways of pre-processing the input
@@ -464,7 +494,7 @@ extern int deflateCopy OF((z_stream *dest,
   destination.
 */
-extern int deflateReset OF((z_stream *strm));
+extern int ZEXPORT deflateReset OF((z_streamp strm));
 /*
     This function is equivalent to deflateEnd followed by deflateInit,
   but does not free and reallocate all the internal compression state.
@@ -475,63 +505,57 @@ extern int deflateReset OF((z_stream *strm));
   stream state was inconsistent (such as zalloc or state being NULL).
 */
-extern int deflateParams OF((z_stream *strm, int level, int strategy));
+extern int ZEXPORT deflateParams OF((z_streamp strm, int level, int strategy));
 /*
-     Dynamically update the compression level and compression strategy.
+     Dynamically update the compression level and compression strategy.  The
-   This can be used to switch between compression and straight copy of
+   interpretation of level and strategy is as in deflateInit2.  This can be
-   the input data, or to switch to a different kind of input data requiring
+   used to switch between compression and straight copy of the input data, or
-   a different strategy. If the compression level is changed, the input
+   to switch to a different kind of input data requiring a different
-   available so far is compressed with the old level (and may be flushed);
+   strategy. If the compression level is changed, the input available so far
-   the new level will take effect only at the next call of deflate().
+   is compressed with the old level (and may be flushed); the new level will
   take effect only at the next call of deflate().
     Before the call of deflateParams, the stream state must be set as for
   a call of deflate(), since the currently available input may have to
   be compressed and flushed. In particular, strm->avail_out must be non-zero.
     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid.
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
   if strm->avail_out was zero.
 */
 /*   
-extern int inflateInit2 OF((z_stream *strm,
+extern int ZEXPORT inflateInit2 OF((z_streamp strm,
-                            int  windowBits));
+                                    int  windowBits));
-     This is another version of inflateInit with more compression options. The
+     This is another version of inflateInit with an extra parameter. The
-   fields next_out, zalloc, zfree and opaque must be initialized before by
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   the caller.
+   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
-   this version of the library (the value 16 will be allowed soon). The
+   this version of the library. The default value is 15 if inflateInit is used
-   default value is 15 if inflateInit is used instead. If a compressed stream
+   instead. If a compressed stream with a larger window size is given as
-   with a larger window size is given as input, inflate() will return with
+   input, inflate() will return with the error code Z_DATA_ERROR instead of
-   the error code Z_DATA_ERROR instead of trying to allocate a larger window.
+   trying to allocate a larger window.
-     If next_out is not null, the library will use this buffer for the history
+      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   buffer; the buffer must either be large enough to hold the entire output
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
-   data, or have at least 1<<windowBits bytes.  If next_out is null, the
+   memLevel). msg is set to null if there is no error message.  inflateInit2
-   library will allocate its own buffer (and leave next_out null). next_in
+   does not perform any decompression apart from reading the zlib header if
-   need not be provided here but must be provided by the application for the
+   present: this will be done by inflate(). (So next_in and avail_in may be
-   next call of inflate().
+   modified, but next_out and avail_out are unchanged.)
     If the history buffer is provided by the application, next_out must
   never be changed by the application since the decompressor maintains
   history information inside this buffer from call to call; the application
   can only reset next_out to the beginning of the history buffer when
   avail_out is zero and all output has been consumed.
      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 decompression: this will be done by
   inflate().
 */
-extern int inflateSetDictionary OF((z_stream *strm,
+extern int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-				    const Bytef *dictionary,
+                                            const Bytef *dictionary,
-				    uInt  dictLength));
+                                            uInt  dictLength));
 /*
-     Initializes the decompression dictionary (history buffer) from the given
+     Initializes the decompression dictionary from the given uncompressed byte
-   uncompressed byte sequence. This function must be called immediately after
+   sequence. This function must be called immediately after a call of inflate
-   a call of inflate if this call returned Z_NEED_DICT. The dictionary chosen
+   if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   by the compressor can be determined from the Adler32 value returned by this
+   can be determined from the Adler32 value returned by this call of
-   call of inflate. The compressor and decompressor must use exactly the same
+   inflate. The compressor and decompressor must use exactly the same
   dictionary (see deflateSetDictionary).
     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
@@ -542,14 +566,14 @@ extern int inflateSetDictionary OF((z_stream *strm,
   inflate().
 */
-extern int inflateSync OF((z_stream *strm));
+extern int ZEXPORT inflateSync OF((z_streamp strm));
 /* 
-    Skips invalid compressed data until the special marker (see deflate()
+    Skips invalid compressed data until a full flush point (see above the
-  above) can be found, or until all available input is skipped. No output
+  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  is provided.
+  available input is skipped. No output is provided.
-    inflateSync returns Z_OK if the special marker has been found, Z_BUF_ERROR
+    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no marker has been found,
+  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
  case, the application may save the current current value of total_in which
  indicates where valid compressed data was found. In the error case, the
@@ -557,7 +581,7 @@ extern int inflateSync OF((z_stream *strm));
  until success or end of the input data.
 */
-extern int inflateReset OF((z_stream *strm));
+extern int ZEXPORT inflateReset OF((z_streamp strm));
 /*
     This function is equivalent to inflateEnd followed by inflateInit,
   but does not free and reallocate all the internal decompression state.
@@ -573,13 +597,13 @@ extern int inflateReset OF((z_stream *strm));
 /*
     The following utility functions are implemented on top of the
   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level, window size,
+   default options are assumed (compression level and memory usage,
   standard memory allocation functions). The source code of these
   utility functions can easily be modified if you need special options.
 */
-extern int compress OF((Bytef *dest,   uLongf *destLen,
+extern int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                        const Bytef *source, uLong sourceLen));
+                                const 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
@@ -593,8 +617,23 @@ extern int compress OF((Bytef *dest,   uLongf *destLen,
   buffer.
 */
-extern int uncompress OF((Bytef *dest,   uLongf *destLen,
+extern int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                          const Bytef *source, uLong sourceLen));
+                                 const Bytef *source, uLong sourceLen,
                                 int level));
 /*
     Compresses the source buffer into the destination buffer. The level
   parameter has the same meaning as in deflateInit.  sourceLen is the byte
   length of the source buffer. Upon entry, destLen is the total size of the
   destination buffer, which must be at least 0.1% larger than sourceLen plus
   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
   Z_STREAM_ERROR if the level parameter is invalid.
 */
 extern int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
                                  const 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
@@ -614,24 +653,28 @@ extern int uncompress OF((Bytef *dest,   uLongf *destLen,
 typedef voidp gzFile;
-extern gzFile gzopen  OF((const char *path, const char *mode));
+extern gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
 /*
     Opens a gzip (.gz) file for reading or writing. The mode parameter
   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;
+   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   in this case gzread will directly read from the file without decompression.
+   Huffman only compression as in "wb1h". (See the description
   of deflateInit2 for more information about the strategy parameter.)
     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).
+   zlib error is Z_MEM_ERROR).  */
 */
-extern gzFile gzdopen  OF((int fd, const char *mode));
+extern gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
 /*
     gzdopen() associates a gzFile with the file descriptor fd.  File
   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").
+   The mode parameter is as in gzopen.
     The next call of gzclose on the returned gzFile will also close the
   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
@@ -639,7 +682,15 @@ extern gzFile gzdopen  OF((int fd, const char *mode));
   the (de)compression state.
 */
-extern int    gzread  OF((gzFile file, voidp buf, unsigned len));
+extern int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 /*
     Dynamically update the compression level or strategy. See the description
   of deflateInit2 for the meaning of these parameters.
     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
   opened for writing.
 */
 extern int ZEXPORT    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
@@ -647,14 +698,49 @@ extern int    gzread  OF((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 OF((gzFile file, const voidp buf, unsigned len));
+extern int ZEXPORT    gzwrite OF((gzFile file, const 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 OF((gzFile file, int flush));
+extern int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
 /*
     Converts, formats, and writes the args to the compressed file under
   control of the format string, as in fprintf. gzprintf returns the number of
   uncompressed bytes actually written (0 in case of error).
 */
 extern int ZEXPORT gzputs OF((gzFile file, const char *s));
 /*
      Writes the given null-terminated string to the compressed file, excluding
   the terminating null character.
      gzputs returns the number of characters written, or -1 in case of error.
 */
 extern char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
 /*
      Reads bytes from the compressed file until len-1 characters are read, or
   a newline character is read and transferred to buf, or an end-of-file
   condition is encountered.  The string is then terminated with a null
   character.
      gzgets returns buf, or Z_NULL in case of error.
 */
 extern int ZEXPORT    gzputc OF((gzFile file, int c));
 /*
      Writes c, converted to an unsigned char, into the compressed file.
   gzputc returns the value that was written, or -1 in case of error.
 */
 extern int ZEXPORT    gzgetc OF((gzFile file));
 /*
      Reads one byte from the compressed file. gzgetc returns this byte
   or -1 in case of end of file or error.
 */
 extern int ZEXPORT    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
@@ -664,14 +750,53 @@ extern int    gzflush OF((gzFile file, int flush));
   degrade compression.
 */
-extern int    gzclose OF((gzFile file));
+extern z_off_t ZEXPORT    gzseek OF((gzFile file, z_off_t offset, int whence));
 /* 
      Sets the starting position for the next gzread or gzwrite on the given
   compressed file. The offset represents a number of bytes in the
   uncompressed data stream. The whence parameter is defined as in lseek(2);
   the value SEEK_END is not supported.
     If the file is opened for reading, this function is emulated but can be
   extremely slow. If the file is opened for writing, only forward seeks are
   supported; gzseek then compresses a sequence of zeroes up to the new
   starting position.
      gzseek returns the resulting offset location as measured in bytes from
   the beginning of the uncompressed stream, or -1 in case of error, in
   particular if the file is opened for writing and the new starting position
   would be before the current position.
 */
 extern int ZEXPORT    gzrewind OF((gzFile file));
 /*
     Rewinds the given file. This function is supported only for reading.
   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
 */
 extern z_off_t ZEXPORT    gztell OF((gzFile file));
 /*
     Returns the starting position for the next gzread or gzwrite on the
   given compressed file. This position represents a number of bytes in the
   uncompressed data stream.
   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
 */
 extern int ZEXPORT gzeof OF((gzFile file));
 /*
     Returns 1 when EOF has previously been detected reading the given
   input stream, otherwise zero.
 */
 extern int ZEXPORT    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 OF((gzFile file, int *errnum));
+extern const char * ZEXPORT 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
@@ -688,7 +813,7 @@ extern char*   gzerror OF((gzFile file, int *errnum));
   compression library.
 */
-extern uLong adler32 OF((uLong adler, const Bytef *buf, uInt len));
+extern uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
 /*
     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
@@ -705,7 +830,7 @@ extern uLong adler32 OF((uLong adler, const Bytef *buf, uInt len));
     if (adler != original_adler) error();
 */
-extern uLong crc32   OF((uLong crc, const Bytef *buf, uInt len));
+extern uLong ZEXPORT crc32   OF((uLong crc, const 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
@@ -727,30 +852,34 @@ extern uLong crc32   OF((uLong crc, const Bytef *buf, uInt len));
 /* deflateInit and inflateInit are macros to allow checking the zlib version
 * and the compiler's view of z_stream:
 */
-extern int deflateInit_ OF((z_stream *strm, int level,
+extern int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-			    const char *version, int stream_size));
+                                    const char *version, int stream_size));
-extern int inflateInit_ OF((z_stream *strm,
+extern int ZEXPORT inflateInit_ OF((z_streamp strm,
-			    const char *version, int stream_size));
+                                    const char *version, int stream_size));
-extern int deflateInit2_ OF((z_stream *strm, int  level, int  method,
+extern int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                             int  windowBits, int  memLevel, int  strategy,
+                                     int windowBits, int memLevel,
-			     const char *version, int stream_size));
+                                     int strategy, const char *version,
-extern int inflateInit2_ OF((z_stream *strm, int  windowBits,
+                                     int stream_size));
-			     const char *version, int stream_size));
+extern int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
                                     const char *version, int stream_size));
 #define deflateInit(strm, level) \
        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
 #define inflateInit(strm) \
        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
 #define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-		      (strategy),           ZLIB_VERSION, sizeof(z_stream))
+                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
 #define inflateInit2(strm, windowBits) \
        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-#ifndef _Z_UTIL_H
+
 #if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL)
    struct internal_state {int dummy;}; /* hack for buggy compilers */
 #endif
-uLongf *get_crc_table OF((void)); /* can be used by asm versions of crc32() */
+extern const char   * ZEXPORT zError           OF((int err));
 extern int            ZEXPORT inflateSyncPoint OF((z_streamp z));
 extern const uLongf * ZEXPORT get_crc_table    OF((void));
 #ifdef __cplusplus
 }
--- a/zutil.c
+++ b/zutil.c
@@ -1,11 +1,9 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-1996 Jean-loup Gailly.
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h 
 */
-/* $Id: zutil.c,v 1.8 1995/05/03 17:27:12 jloup Exp $ */
+/* @(#) $Id$ */
 #include <stdio.h>
 #include "zutil.h"
@@ -15,8 +13,6 @@ struct internal_state      {int dummy;}; /* for buggy compilers */
 extern void exit OF((int));
 #endif
 const char *zlib_version = ZLIB_VERSION;
 const char *z_errmsg[10] = {
 "need dictionary",     /* Z_NEED_DICT       2  */
 "stream end",          /* Z_STREAM_END      1  */
@@ -30,12 +26,35 @@ const char *z_errmsg[10] = {
 ""};
 const char * ZEXPORT zlibVersion()
 {
    return ZLIB_VERSION;
 }
 #ifdef DEBUG
 #  ifndef verbose
 #    define verbose 0
 #  endif
 int z_verbose = verbose;
 void z_error (m)
    char *m;
 {
    fprintf(stderr, "%s\n", m);
    exit(1);
 }
 #endif
 /* exported to allow conversion of error code to string for compress() and
 * uncompress()
 */
 const char * ZEXPORT zError(err)
    int err;
 {
    return ERR_MSG(err);
 }
 #ifndef HAVE_MEMCPY
@@ -50,6 +69,19 @@ void zmemcpy(dest, source, len)
    } while (--len != 0);
 }
 int zmemcmp(s1, s2, len)
    Bytef* s1;
    Bytef* s2;
    uInt  len;
 {
    uInt j;
    for (j = 0; j < len; j++) {
        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
    }
    return 0;
 }
 void zmemzero(dest, len)
    Bytef* dest;
    uInt  len;
@@ -135,14 +167,14 @@ void  zcfree (voidpf opaque, voidpf ptr)
        return;
    }
    ptr = opaque; /* just to make some compilers happy */
-    z_error("zcfree: ptr not found");
+    Assert(0, "zcfree: ptr not found");
 }
 #endif
 #endif /* __TURBOC__ */
-#if defined(M_I86) && !(defined(__WATCOMC__) && defined(__386__))
+#if defined(M_I86) && !defined(__32BIT__)
-/* Microsoft C */
+/* Microsoft C in 16-bit mode */
 #  define MY_ZCALLOC
@@ -178,7 +210,7 @@ voidpf zcalloc (opaque, items, size)
    unsigned items;
    unsigned size;
 {
-    if (opaque) opaque = 0; /* to make compiler happy */
+    if (opaque) items += size - size; /* make compiler happy */
    return (voidpf)calloc(items, size);
 }
@@ -186,8 +218,8 @@ void  zcfree (opaque, ptr)
    voidpf opaque;
    voidpf ptr;
 {
    if (opaque) opaque = 0; /* to make compiler happy */
    free(ptr);
    if (opaque) return; /* make compiler happy */
 }
 #endif /* MY_ZCALLOC */
--- a/zutil.h
+++ b/zutil.h
@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-1996 Jean-loup Gailly.
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@@ -8,23 +8,23 @@
   subject to change. Applications should only use zlib.h.
 */
-/* $Id: zutil.h,v 1.9 1995/05/03 17:27:12 jloup Exp $ */
+/* @(#) $Id$ */
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
 #include "zlib.h"
 #if defined(MSDOS) || defined(VMS) || defined(CRAY) || defined(WIN32)
 #   include <stddef.h>
 #   include <errno.h>
 #else
    extern int errno;
 #endif
 #ifdef STDC
 #  include <stddef.h>
 #  include <string.h>
 #  include <stdlib.h>
 #endif
 #ifdef NO_ERRNO_H
    extern int errno;
 #else
 #   include <errno.h>
 #endif
 #ifndef local
 #  define local static
@@ -40,10 +40,10 @@ typedef unsigned long  ulg;
 extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
-#define ERR_MSG(err) (char*)z_errmsg[Z_NEED_DICT-(err)]
+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
 #define ERR_RETURN(strm,err) \
-  return (strm->msg = ERR_MSG(err), (err))
+  return (strm->msg = (char*)ERR_MSG(err), (err))
 /* To be used only when the state is known to be valid */
        /* common constants */
@@ -76,7 +76,13 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #ifdef MSDOS
 #  define OS_CODE  0x00
 #  ifdef __TURBOC__
-#    include <alloc.h>
+#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
       /* Allow compilation with ANSI keywords only enabled */
       void _Cdecl farfree( void *block );
       void *_Cdecl farmalloc( unsigned long nbytes );
 #    else
 #     include <alloc.h>
 #    endif
 #  else /* MSC or DJGPP */
 #    include <malloc.h>
 #  endif
@@ -92,7 +98,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #if defined(VAXC) || defined(VMS)
 #  define OS_CODE  0x02
-#  define FOPEN(name, mode) \
+#  define F_OPEN(name, mode) \
     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
 #endif
@@ -104,8 +110,16 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define OS_CODE  0x05
 #endif
-#ifdef MACOS
+#if defined(MACOS) || defined(TARGET_OS_MAC)
 #  define OS_CODE  0x07
 #  ifndef fdopen
 #    define fdopen(fd,mode) NULL /* No fdopen() */
 #  endif
 #endif
 #if defined(__MWERKS__) && !defined(fdopen)
 #  if __dest_os != __be_os && __dest_os != __win32_os
 #    define fdopen(fd,mode) NULL
 #  endif
 #endif
 #ifdef __50SERIES /* Prime/PRIMOS */
@@ -116,14 +130,23 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define OS_CODE  0x0a
 #endif
 #if defined(_BEOS_) || defined(RISCOS)
 #  define fdopen(fd,mode) NULL /* No fdopen() */
 #endif
 #if (defined(_MSC_VER) && (_MSC_VER >= 600))
 #  define fdopen(fd,type)  _fdopen(fd,type)
 #endif
        /* Common defaults */
 #ifndef OS_CODE
 #  define OS_CODE  0x03  /* assume Unix */
 #endif
-#ifndef FOPEN
+#ifndef F_OPEN
-#  define FOPEN(name, mode) fopen((name), (mode))
+#  define F_OPEN(name, mode) fopen((name), (mode))
 #endif
         /* functions */
@@ -138,9 +161,10 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #if defined(pyr)
 #  define NO_MEMCPY
 #endif
-#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(_MSC_VER)
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
 /* 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).
  * The __SC__ check is for Symantec.
  */
 #  define NO_MEMCPY
 #endif
@@ -159,21 +183,21 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #else
   extern void zmemcpy  OF((Bytef* dest, Bytef* source, uInt len));
   extern int  zmemcmp  OF((Bytef* s1,   Bytef* s2, uInt len));
   extern void zmemzero OF((Bytef* dest, uInt len));
 #endif
 /* Diagnostic functions */
 #ifdef DEBUG
 #  include <stdio.h>
-#  ifndef verbose
+   extern int z_verbose;
-#    define verbose 0
+   extern void z_error    OF((char *m));
 #  endif
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-#  define Trace(x) fprintf x
+#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
-#  define Tracev(x) {if (verbose) fprintf x ;}
+#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
-#  define Tracevv(x) {if (verbose>1) fprintf x ;}
+#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
+#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}
+#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
 #else
 #  define Assert(cond,msg)
 #  define Trace(x)
@@ -184,10 +208,8 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
-typedef uLong (*check_func) OF((uLong check, const Bytef *buf, uInt len));
+typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
-
+				       uInt len));
 extern void z_error    OF((char *m));
 voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
 void   zcfree  OF((voidpf opaque, voidpf ptr));
Author	SHA1	Message	Date
Mark Adler	02b6cf579f	zlib 1.1.1	2011-09-09 23:20:07 -07:00
Mark Adler	965fe72aed	zlib 1.1.0	2011-09-09 23:19:55 -07:00
Mark Adler	b8c9ecb076	zlib 1.0.9	2011-09-09 23:19:21 -07:00
Mark Adler	6759211ad8	zlib 1.0.8	2011-09-09 23:18:57 -07:00
Mark Adler	7850e4e406	zlib 1.0.7	2011-09-09 23:17:33 -07:00
Mark Adler	ebd3c2c0e7	zlib 1.0.5	2011-09-09 23:17:17 -07:00
Mark Adler	ff11b0a61f	zlib 1.0.4	2011-09-09 23:17:02 -07:00
Mark Adler	e26a448e96	zlib 1.0.2	2011-09-09 23:15:17 -07:00
Mark Adler	423eb40306	zlib 1.0.1	2011-09-09 23:14:39 -07:00
Mark Adler	8a2acbffc8	zlib 1.0-pre	2011-09-09 23:13:27 -07:00
		`@@ -0,0 +1 @@`
							`c:\masm611\bin\ml /coff /Zi /c /Flgvmat32.lst gvmat32.asm`