diff options
| author | kientzle <kientzle@FreeBSD.org> | 2005-05-11 03:47:48 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2005-05-11 03:47:48 +0000 |
| commit | 2f1311730e491ca59294adde890462dadbeb3993 (patch) | |
| tree | 3456c8a5a45eb53dd1ef5c3ec9bebb4b2ab74c3c /lib/libz/deflate.h | |
| parent | 3f1dd047fb33cff02eb05f7dd92b73a4b805a5ea (diff) | |
| download | FreeBSD-src-2f1311730e491ca59294adde890462dadbeb3993.zip FreeBSD-src-2f1311730e491ca59294adde890462dadbeb3993.tar.gz | |
Since the FreeBSD local modifications are mostly trivial (consisting
primarily of pointless $FreeBSD$ tags), sync most files in HEAD with
those in the ZLIB branch. This minimizes the differences between
HEAD and ZLIB and should simplify future imports.
After this, there are only three files with local modifications
(gzio.c, minigzip.c, and zconf.h) and two non-vendor files
(Makefile, zopen.c). The rest exactly match the vendor distribution.
PR: i386/76294
MFC after: 2 weeks
Diffstat (limited to 'lib/libz/deflate.h')
| -rw-r--r-- | lib/libz/deflate.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libz/deflate.h b/lib/libz/deflate.h index 8f4ff2d..410681d 100644 --- a/lib/libz/deflate.h +++ b/lib/libz/deflate.h @@ -8,7 +8,7 @@ subject to change. Applications should only use zlib.h. */ -/* @(#) $FreeBSD$ */ +/* @(#) $Id$ */ #ifndef DEFLATE_H #define DEFLATE_H @@ -95,7 +95,6 @@ typedef struct internal_state { Bytef *pending_out; /* next pending byte to output to the stream */ int pending; /* nb of bytes in the pending buffer */ int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ - Byte data_type; /* UNKNOWN, BINARY or ASCII */ Byte method; /* STORED (for zip only) or DEFLATED */ int last_flush; /* value of flush param for previous deflate call */ |
