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/inffast.c | |
| 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/inffast.c')
| -rw-r--r-- | lib/libz/inffast.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/libz/inffast.c b/lib/libz/inffast.c index c5c93a5..8c02a17 100644 --- a/lib/libz/inffast.c +++ b/lib/libz/inffast.c @@ -1,11 +1,8 @@ /* inffast.c -- fast decoding - * Copyright (C) 1995-2003 Mark Adler + * Copyright (C) 1995-2004 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include "zutil.h" #include "inftrees.h" #include "inflate.h" @@ -22,7 +19,7 @@ __FBSDID("$FreeBSD$"); - none No measurable difference: - Pentium III (Anderson) - - 68060 (Nikl) + - M68060 (Nikl) */ #ifdef POSTINC # define OFF 0 |
