Fix install_name_tool calls in OS X "make install".

[wxWidgets.git] / src / zlib / compress.c

diff --git a/src/zlib/compress.c b/src/zlib/compress.c
index df04f0148e6d6a22ce0f5bc4e3eeeb7bb54ca605..8699c7abeb0f7ca298e4ee6b2cade77111bb054e 100644 (file)
--- a/src/zlib/compress.c
+++ b/src/zlib/compress.c
@@ -1,9 +1,8 @@
 /* compress.c -- compress a memory buffer
 /* 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
  */
 
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

-/* @(#) $Id$ */

 
 #define ZLIB_INTERNAL
 #include "zlib.h"
 
 #define ZLIB_INTERNAL
 #include "zlib.h"


@@ -29,7 +28,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
     z_stream stream;
     int err;
 
     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: */
     stream.avail_in = (uInt)sourceLen;
 #ifdef MAXSEG_64K
     /* Check for source > 64K on 16-bit machine: */


@@ -75,5 +74,6 @@ int ZEXPORT compress (dest, destLen, source, sourceLen)
 uLong ZEXPORT compressBound (sourceLen)
     uLong sourceLen;
 {
 uLong ZEXPORT compressBound (sourceLen)
     uLong sourceLen;
 {

-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13;

 }
 }