summaryrefslogtreecommitdiff
path: root/source4/lib/zlib/compress.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-08-19 14:54:30 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-08-19 14:54:30 +1000
commit5631ebaf78fee35880aafe29578b8925c655e5f4 (patch)
tree8a9bceb40f3f4839dc1cc8a5ac38982536911d7f /source4/lib/zlib/compress.c
parentfe95409de76cf64bb65dbc9ce1ed2ddf9774a896 (diff)
parentb33f4541f6157163f9b22af8607ecefe3953638f (diff)
downloadsamba-5631ebaf78fee35880aafe29578b8925c655e5f4.tar.gz
samba-5631ebaf78fee35880aafe29578b8925c655e5f4.tar.bz2
samba-5631ebaf78fee35880aafe29578b8925c655e5f4.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit a6146cc14ba950b1911094b1525c7d06b50ecec6)
Diffstat (limited to 'source4/lib/zlib/compress.c')
-rw-r--r--source4/lib/zlib/compress.c5
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: */