diff options
| author | Tom Tromey <tromey@redhat.com> | 2002-03-11 22:11:18 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2002-03-11 22:11:18 +0000 |
| commit | e1b56469bfadaf43c8af59bdfdd199ba9d6b7f14 (patch) | |
| tree | f1412386f2b8672f1b5cfdf967e1abcd29d60ca9 /zlib/deflate.c | |
| parent | 932b4e3e24e2c7f608af4e69cfacea8a25a4f1e0 (diff) | |
| download | gcc-e1b56469bfadaf43c8af59bdfdd199ba9d6b7f14.zip gcc-e1b56469bfadaf43c8af59bdfdd199ba9d6b7f14.tar.gz gcc-e1b56469bfadaf43c8af59bdfdd199ba9d6b7f14.tar.bz2 | |
* ChangeLog.gcj: Imported 1.1.4, while preserving local changes.
From-SVN: r50612
Diffstat (limited to 'zlib/deflate.c')
| -rw-r--r-- | zlib/deflate.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/zlib/deflate.c b/zlib/deflate.c index 7d5ae93..2814238 100644 --- a/zlib/deflate.c +++ b/zlib/deflate.c @@ -1,5 +1,5 @@ /* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-1998 Jean-loup Gailly. + * Copyright (C) 1995-2002 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -47,12 +47,12 @@ * */ -/* @(#) $Id: deflate.c,v 1.1 1999/05/04 19:30:26 tromey Exp $ */ +/* @(#) $Id: deflate.c,v 1.1.1.2 2002/03/11 21:53:23 tromey Exp $ */ #include "deflate.h" const char deflate_copyright[] = - " deflate 1.1.3 Copyright 1995-1998 Jean-loup Gailly "; + " deflate 1.1.4 Copyright 1995-2002 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 @@ -242,7 +242,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, windowBits = -windowBits; } if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || - windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || + windowBits < 9 || windowBits > 15 || level < 0 || level > 9 || strategy < 0 || strategy > Z_HUFFMAN_ONLY) { return Z_STREAM_ERROR; } |