Slider Updates

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

diff --git a/src/zlib/compress.c b/src/zlib/compress.c
index 1cee470913d75a3fa74c998c5638920fc382ec07..9f515694928de2e0a4ef7e0cd09333487889eece 100644 (file)
--- a/src/zlib/compress.c
+++ b/src/zlib/compress.c
@@ -1,11 +1,11 @@
 /* compress.c -- compress a memory buffer
 /* compress.c -- compress a memory buffer

- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h

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

-#include "zlib.h"
+#include "../zlib/zlib.h"

 
 /* ===========================================================================
      Compresses the source buffer into the destination buffer. The level
 
 /* ===========================================================================
      Compresses the source buffer into the destination buffer. The level


@@ -18,12 +18,16 @@
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
    Z_STREAM_ERROR if the level parameter is invalid.
 */
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
    Z_STREAM_ERROR if the level parameter is invalid.
 */

+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */
+int ZEXPORT compress2 (Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen, int level)
+#else

 int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
     uLong sourceLen;
     int level;
 int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
     uLong sourceLen;
     int level;

+#endif

 {
     z_stream stream;
     int err;
 {
     z_stream stream;
     int err;


@@ -58,11 +62,15 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
 
 /* ===========================================================================
  */
 
 /* ===========================================================================
  */

+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */
+int ZEXPORT compress (Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen)
+#else

 int ZEXPORT compress (dest, destLen, source, sourceLen)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
     uLong sourceLen;
 int ZEXPORT compress (dest, destLen, source, sourceLen)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
     uLong sourceLen;

+#endif

 {
     return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
 }
 {
     return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
 }