summaryrefslogtreecommitdiffstats
path: root/lib/libz/zconf.h
Commit message (Collapse)AuthorAgeFilesLines
* Update zconf.h and gzio.c with changes from ZLib 1.2.1 to ZLib 1.2.2.kientzle2005-04-241-40/+49
| | | | | | | | | | | These are two of the three files that have non-trivial differences from the vendor branch. minigzip.c is the third, but there were no changes from ZLib 1.2.1 to ZLib 1.2.2 in that file. The rest of the files I intend to get reverted back to the vendor branch (with cooperation of cvsadmin@). PR: i386/76294
* Resolve conflicts.tjr2004-06-301-108/+153
|
* Fix conflicts.green2002-03-111-1/+1
|
* Hard-configure z_off_t as long. Soft configuration using HAVE_UNISTD_Hbde1999-10-091-4/+6
| | | | | | | | | | | | | | | | | just breaks the prototypes for gzseek() and gztell() when an application defines HAVE_UNISTD_H before including <zlib.h>. z_off_t was always long for compiling zlib, but was sometimes off_t for compiling applications, e.g., Ethereal 0.7.5. This "fix" preserves bug for bug binary compatibility. z_off_t should be off_t for everything, but zlib doesn't support off_t being longer than long, so using the correct type without fixing zlib's internals would at best break binary compatibility. This "fix" also make the namespace problems for HAVE_UNISTD_H no worse than hundreds of other namespace prooblems in zconf.h. I'll wait for a new release of zlib for proper fixes. Reported by: Guy Harris via jkh
* $Id$ -> $FreeBSD$peter1999-08-281-1/+1
|
* Merge changes from vendor branch (1.1.1 -> 1.1.3) into mainline.peter1999-01-101-23/+50
|
* Merge conflicts.steve1998-02-281-12/+80
|
* Make the long-awaited change from $Id$ to $FreeBSD$jkh1997-01-141-1/+1
| | | | | | | | This will make a number of things easier in the future, as well as (finally!) avoiding the Id-smashing problem which has plagued developers for so long. Boy, I'm glad we're not using sup anymore. This update would have been insane otherwise.
* Initial import of zlib-1.0.4peter1996-08-181-0/+184
OpenPOWER on IntegriCloud