diff options
| author | Björn Gustavsson <[email protected]> | 2014-01-09 12:26:18 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-01-14 09:30:34 +0100 |
| commit | 9205b6671892e7516e8571e4ecf19bfa2ade1130 (patch) | |
| tree | e2027206adefa16bdd3a323824986ef0719b4806 /erts/emulator/zlib/compress.c | |
| parent | 069f9ec3dfd7a4dc17973e22dc271d40ebe11467 (diff) | |
| download | otp-9205b6671892e7516e8571e4ecf19bfa2ade1130.tar.gz otp-9205b6671892e7516e8571e4ecf19bfa2ade1130.tar.bz2 otp-9205b6671892e7516e8571e4ecf19bfa2ade1130.zip | |
Update zlib to 1.2.8
Diffstat (limited to 'erts/emulator/zlib/compress.c')
| -rw-r--r-- | erts/emulator/zlib/compress.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/erts/emulator/zlib/compress.c b/erts/emulator/zlib/compress.c index 28bceb15f8..8ecef0f790 100644 --- a/erts/emulator/zlib/compress.c +++ b/erts/emulator/zlib/compress.c @@ -1,10 +1,8 @@ /* compress.c -- compress a memory buffer - * Copyright (C) 1995-2003 Jean-loup Gailly. + * Copyright (C) 1995-2005 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ -/* %ExternalCopyright% */ - /* @(#) $Id$ */ #ifdef HAVE_CONFIG_H @@ -34,7 +32,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) z_stream stream; int err; - stream.next_in = (Bytef*)source; + stream.next_in = (z_const Bytef *)source; stream.avail_in = (uInt)sourceLen; #ifdef MAXSEG_64K /* Check for source > 64K on 16-bit machine: */ @@ -80,5 +78,6 @@ int ZEXPORT compress (dest, destLen, source, sourceLen) uLong ZEXPORT compressBound (sourceLen) uLong sourceLen; { - return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11; + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + + (sourceLen >> 25) + 13; } |