diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:10:53 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:10:53 +1000 |
commit | aef684da3149eaf2b8d87c4903af241c9a2311a6 (patch) | |
tree | 5b383bca4046f59b243293e721b730f860fb86ec /source4/lib/zlib/compress.c | |
parent | 47d80366bef5e62b6727a574b2300cc94a2e18f7 (diff) | |
parent | 4422617f7a5c36740263397b1672f75efe879520 (diff) | |
download | samba-aef684da3149eaf2b8d87c4903af241c9a2311a6.tar.gz samba-aef684da3149eaf2b8d87c4903af241c9a2311a6.tar.bz2 samba-aef684da3149eaf2b8d87c4903af241c9a2311a6.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 27d07df301d60e49d36efd003f2fd2305c83c3fe)
Diffstat (limited to 'source4/lib/zlib/compress.c')
-rw-r--r-- | source4/lib/zlib/compress.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/lib/zlib/compress.c b/source4/lib/zlib/compress.c index df04f0148e..40a53cd476 100644 --- a/source4/lib/zlib/compress.c +++ b/source4/lib/zlib/compress.c @@ -5,8 +5,7 @@ /* @(#) $Id$ */ -#define ZLIB_INTERNAL -#include "zlib.h" +#include "zutil.h" /* =========================================================================== Compresses the source buffer into the destination buffer. The level @@ -29,7 +28,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) z_stream stream; int err; - stream.next_in = (Bytef*)source; + stream.next_in = source; stream.avail_in = (uInt)sourceLen; #ifdef MAXSEG_64K /* Check for source > 64K on 16-bit machine: */ |